ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-12-06 17:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: Mark JSON literal strings with R"JSON (#2169)

Browse Source
This commit is contained in:
Ayaz Salikhov
2025-05-30 15:50:39 +01:00
committed by GitHub
parent 7588e9d5bf
commit ecdea015b9
76 changed files with 2811 additions and 2748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/feed/BookChangesFeedTests.cpp
View File

@@ -61,7 +61,7 @@ TEST_F(FeedBookChangeTest, Pub)
transactions.push_back(trans1);
static constexpr auto kBOOK_CHANGE_PUBLISH =
R"({
R"JSON({
"type":"bookChanges",
"ledger_index":32,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
@@ -79,7 +79,7 @@ TEST_F(FeedBookChangeTest, Pub)
"close":"-1"
}
]
})";
})JSON";
EXPECT_CALL(*mockSessionPtr, send(sharedStringJsonEq(kBOOK_CHANGE_PUBLISH))).Times(1);
testFeedPtr->pub(ledgerHeader, transactions);

2
tests/unit/feed/ForwardFeedTests.cpp
View File

@@ -34,7 +34,7 @@ using namespace util::prometheus;
namespace {
constexpr auto kFEED = R"({"test":"test"})";
constexpr auto kFEED = R"JSON({"test":"test"})JSON";
} // namespace

12
tests/unit/feed/LedgerFeedTests.cpp
View File

@@ -52,7 +52,7 @@ TEST_F(FeedLedgerTest, SubPub)
// includes the same fields as a ledger stream message, except that it omits
// the type and txn_count fields
static constexpr auto kLEDGER_RESPONSE =
R"({
R"JSON({
"validated_ledgers":"10-30",
"ledger_index":30,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
@@ -60,7 +60,7 @@ TEST_F(FeedLedgerTest, SubPub)
"fee_base":1,
"reserve_base":3,
"reserve_inc":2
})";
})JSON";
boost::asio::io_context ioContext;
boost::asio::spawn(ioContext, [this](boost::asio::yield_context yield) {
EXPECT_CALL(*mockSessionPtr, onDisconnect);
@@ -72,7 +72,7 @@ TEST_F(FeedLedgerTest, SubPub)
EXPECT_EQ(testFeedPtr->count(), 1);
static constexpr auto kLEDGER_PUB =
R"({
R"JSON({
"type":"ledgerClosed",
"ledger_index":31,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
@@ -82,7 +82,7 @@ TEST_F(FeedLedgerTest, SubPub)
"reserve_inc":0,
"validated_ledgers":"10-31",
"txn_count":8
})";
})JSON";
// test publish
EXPECT_CALL(*mockSessionPtr, send(sharedStringJsonEq(kLEDGER_PUB))).Times(1);
@@ -107,7 +107,7 @@ TEST_F(FeedLedgerTest, AutoDisconnect)
auto const feeBlob = createLegacyFeeSettingBlob(1, 2, 3, 4, 0);
EXPECT_CALL(*backend_, doFetchLedgerObject).WillOnce(testing::Return(feeBlob));
static constexpr auto kLEDGER_RESPONSE =
R"({
R"JSON({
"validated_ledgers":"10-30",
"ledger_index":30,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
@@ -115,7 +115,7 @@ TEST_F(FeedLedgerTest, AutoDisconnect)
"fee_base":1,
"reserve_base":3,
"reserve_inc":2
})";
})JSON";
web::SubscriptionContextInterface::OnDisconnectSlot slot;
EXPECT_CALL(*mockSessionPtr, onDisconnect).WillOnce(testing::SaveArg<0>(&slot));

4
tests/unit/feed/ProposedTransactionFeedTests.cpp
View File

@@ -40,7 +40,7 @@ constexpr auto kACCOUNT1 = "rh1HPuRVsYYvThxG2Bs1MfjmrVC73S16Fb";
constexpr auto kACCOUNT2 = "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun";
constexpr auto kACCOUNT3 = "r92yNeoiCdwULRbjh6cUBEbD71iHcqe1hE";
constexpr auto kDUMMY_TRANSACTION =
R"({
R"JSON({
"transaction":
{
"Account":"rh1HPuRVsYYvThxG2Bs1MfjmrVC73S16Fb",
@@ -54,7 +54,7 @@ constexpr auto kDUMMY_TRANSACTION =
"TxnSignature":"30450221009BD0D563B24E50B26A42F30455AD21C3D5CD4D80174C41F7B54969FFC08DE94C02201FC35320B56D56D1E34D1D281D48AC68CBEDDD6EE9DFA639CCB08BB251453A87",
"hash":"F44393295DB860C6860769C16F5B23887762F09F87A8D1174E0FCFF9E7247F07"
}
})";
})JSON";
} // namespace

2
tests/unit/feed/SingleFeedBaseTests.cpp
View File

@@ -32,7 +32,7 @@
#include <memory>
namespace {
constexpr auto kFEED = R"({"test":"test"})";
constexpr auto kFEED = R"JSON({"test":"test"})JSON";
} // namespace
using namespace feed::impl;

40
tests/unit/feed/SubscriptionManagerTests.cpp
View File

@@ -92,8 +92,8 @@ TEST_F(SubscriptionManagerAsyncTest, MultipleThreadCtx)
EXPECT_CALL(*sessionPtr_, onDisconnect);
subscriptionManagerPtr_->subValidation(session_);
static constexpr auto kJSON_MANIFEST = R"({"manifest":"test"})";
static constexpr auto kJSON_VALIDATION = R"({"validation":"test"})";
static constexpr auto kJSON_MANIFEST = R"JSON({"manifest":"test"})JSON";
static constexpr auto kJSON_VALIDATION = R"JSON({"validation":"test"})JSON";
EXPECT_CALL(*sessionPtr_, send(testing::_)).Times(testing::AtMost(2));
@@ -111,14 +111,14 @@ TEST_F(SubscriptionManagerAsyncTest, MultipleThreadCtxSessionDieEarly)
EXPECT_CALL(*sessionPtr_, send(testing::_)).Times(0);
session_.reset();
subscriptionManagerPtr_->forwardManifest(json::parse(R"({"manifest":"test"})").get_object());
subscriptionManagerPtr_->forwardValidation(json::parse(R"({"validation":"test"})").get_object());
subscriptionManagerPtr_->forwardManifest(json::parse(R"JSON({"manifest":"test"})JSON").get_object());
subscriptionManagerPtr_->forwardValidation(json::parse(R"JSON({"validation":"test"})JSON").get_object());
}
TEST_F(SubscriptionManagerTest, ReportCurrentSubscriber)
{
static constexpr auto kREPORT_RETURN =
R"({
R"JSON({
"ledger":0,
"transactions":2,
"transactions_proposed":2,
@@ -128,7 +128,7 @@ TEST_F(SubscriptionManagerTest, ReportCurrentSubscriber)
"accounts_proposed":2,
"books":2,
"book_changes":2
})";
})JSON";
web::SubscriptionContextPtr const session1 = std::make_shared<MockSession>();
MockSession* mockSession1 = dynamic_cast<MockSession*>(session1.get());
@@ -200,7 +200,7 @@ TEST_F(SubscriptionManagerTest, ReportCurrentSubscriber)
TEST_F(SubscriptionManagerTest, ManifestTest)
{
static constexpr auto kDUMMY_MANIFEST = R"({"manifest":"test"})";
static constexpr auto kDUMMY_MANIFEST = R"JSON({"manifest":"test"})JSON";
EXPECT_CALL(*sessionPtr_, onDisconnect);
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDUMMY_MANIFEST)));
subscriptionManagerPtr_->subManifest(session_);
@@ -213,7 +213,7 @@ TEST_F(SubscriptionManagerTest, ManifestTest)
TEST_F(SubscriptionManagerTest, ValidationTest)
{
static constexpr auto kDUMMY = R"({"validation":"test"})";
static constexpr auto kDUMMY = R"JSON({"validation":"test"})JSON";
EXPECT_CALL(*sessionPtr_, onDisconnect);
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDUMMY)));
subscriptionManagerPtr_->subValidation(session_);
@@ -240,7 +240,7 @@ TEST_F(SubscriptionManagerTest, BookChangesTest)
trans1.metadata = metaObj.getSerializer().peekData();
transactions.push_back(trans1);
static constexpr auto kBOOK_CHANGE_PUBLISH =
R"({
R"JSON({
"type":"bookChanges",
"ledger_index":32,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
@@ -258,7 +258,7 @@ TEST_F(SubscriptionManagerTest, BookChangesTest)
"close":"-1"
}
]
})";
})JSON";
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kBOOK_CHANGE_PUBLISH)));
subscriptionManagerPtr_->pubBookChanges(ledgerHeader, transactions);
@@ -280,7 +280,7 @@ TEST_F(SubscriptionManagerTest, LedgerTest)
// includes the same fields as a ledger stream message, except that it omits
// the type and txn_count fields
static constexpr auto kLEDGER_RESPONSE =
R"({
R"JSON({
"validated_ledgers":"10-30",
"ledger_index":30,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
@@ -288,7 +288,7 @@ TEST_F(SubscriptionManagerTest, LedgerTest)
"fee_base":1,
"reserve_base":3,
"reserve_inc":2
})";
})JSON";
boost::asio::io_context ctx;
boost::asio::spawn(ctx, [this](boost::asio::yield_context yield) {
EXPECT_CALL(*sessionPtr_, onDisconnect);
@@ -304,7 +304,7 @@ TEST_F(SubscriptionManagerTest, LedgerTest)
auto fee2 = ripple::Fees();
fee2.reserve = 10;
static constexpr auto kLEDGER_PUB =
R"({
R"JSON({
"type":"ledgerClosed",
"ledger_index":31,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
@@ -314,7 +314,7 @@ TEST_F(SubscriptionManagerTest, LedgerTest)
"reserve_inc":0,
"validated_ledgers":"10-31",
"txn_count":8
})";
})JSON";
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kLEDGER_PUB)));
subscriptionManagerPtr_->pubLedger(ledgerHeader2, fee2, "10-31", 8);
@@ -345,7 +345,7 @@ TEST_F(SubscriptionManagerTest, TransactionTest)
auto const metaObj = createMetaDataForBookChange(kCURRENCY, kISSUER, 22, 3, 1, 1, 3);
trans1.metadata = metaObj.getSerializer().peekData();
static constexpr auto kORDERBOOK_PUBLISH =
R"({
R"JSON({
"transaction":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -404,7 +404,7 @@ TEST_F(SubscriptionManagerTest, TransactionTest)
"engine_result":"tesSUCCESS",
"close_time_iso": "2000-01-01T00:00:00Z",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kORDERBOOK_PUBLISH))).Times(3);
EXPECT_CALL(*sessionPtr_, apiSubversion).Times(3).WillRepeatedly(testing::Return(1));
subscriptionManagerPtr_->pubTransaction(trans1, ledgerHeader);
@@ -427,15 +427,15 @@ TEST_F(SubscriptionManagerTest, ProposedTransactionTest)
EXPECT_EQ(subscriptionManagerPtr_->report()["transactions_proposed"], 1);
static constexpr auto kDUMMY_TRANSACTION =
R"({
R"JSON({
"transaction":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
"Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun"
}
})";
})JSON";
static constexpr auto kORDERBOOK_PUBLISH =
R"({
R"JSON({
"transaction":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -494,7 +494,7 @@ TEST_F(SubscriptionManagerTest, ProposedTransactionTest)
"engine_result":"tesSUCCESS",
"close_time_iso": "2000-01-01T00:00:00Z",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDUMMY_TRANSACTION))).Times(2);
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kORDERBOOK_PUBLISH))).Times(2);
subscriptionManagerPtr_->forwardProposedTransaction(json::parse(kDUMMY_TRANSACTION).get_object());

36
tests/unit/feed/TransactionFeedTests.cpp
View File

@@ -60,7 +60,7 @@ constexpr auto kLPTOKEN_CURRENCY = "037C35306B24AAB7FF90848206E003279AA47090";
constexpr auto kNETWORK_ID = 0u;
constexpr auto kTRAN_V1 =
R"({
R"JSON({
"transaction":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -115,10 +115,10 @@ constexpr auto kTRAN_V1 =
"engine_result_code":0,
"engine_result":"tesSUCCESS",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
constexpr auto kTRAN_V2 =
R"({
R"JSON({
"tx_json":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -168,7 +168,7 @@ constexpr auto kTRAN_V2 =
"engine_result_code":0,
"engine_result":"tesSUCCESS",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
} // namespace
@@ -366,7 +366,7 @@ TEST_F(FeedTransactionTest, SubBookV1)
trans1.metadata = metaObj.getSerializer().peekData();
static constexpr auto kORDERBOOK_PUBLISH =
R"({
R"JSON({
"transaction":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -424,7 +424,7 @@ TEST_F(FeedTransactionTest, SubBookV1)
"engine_result":"tesSUCCESS",
"close_time_iso": "2000-01-01T00:00:00Z",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
EXPECT_CALL(*mockSessionPtr, apiSubversion).WillOnce(testing::Return(1));
EXPECT_CALL(*mockSessionPtr, send(sharedStringJsonEq(kORDERBOOK_PUBLISH))).Times(1);
@@ -435,7 +435,7 @@ TEST_F(FeedTransactionTest, SubBookV1)
trans1.metadata = metaObj.getSerializer().peekData();
static constexpr auto kORDERBOOK_CANCEL_PUBLISH =
R"({
R"JSON({
"transaction":{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
"Amount":"1",
@@ -481,7 +481,7 @@ TEST_F(FeedTransactionTest, SubBookV1)
"engine_result":"tesSUCCESS",
"close_time_iso": "2000-01-01T00:00:00Z",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
EXPECT_CALL(*mockSessionPtr, apiSubversion).WillOnce(testing::Return(1));
EXPECT_CALL(*mockSessionPtr, send(sharedStringJsonEq(kORDERBOOK_CANCEL_PUBLISH))).Times(1);
@@ -489,7 +489,7 @@ TEST_F(FeedTransactionTest, SubBookV1)
// trigger by offer create meta data
static constexpr auto kORDERBOOK_CREATE_PUBLISH =
R"({
R"JSON({
"transaction":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -537,7 +537,7 @@ TEST_F(FeedTransactionTest, SubBookV1)
"engine_result":"tesSUCCESS",
"close_time_iso": "2000-01-01T00:00:00Z",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
metaObj = createMetaDataForCreateOffer(kCURRENCY, kISSUER, 22, 3, 1);
trans1.metadata = metaObj.getSerializer().peekData();
@@ -570,7 +570,7 @@ TEST_F(FeedTransactionTest, SubBookV2)
trans1.metadata = metaObj.getSerializer().peekData();
static constexpr auto kORDERBOOK_PUBLISH =
R"({
R"JSON({
"tx_json":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -628,7 +628,7 @@ TEST_F(FeedTransactionTest, SubBookV2)
"close_time_iso": "2000-01-01T00:00:00Z",
"hash":"51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
EXPECT_CALL(*mockSessionPtr, apiSubversion).WillOnce(testing::Return(2));
EXPECT_CALL(*mockSessionPtr, send(sharedStringJsonEq(kORDERBOOK_PUBLISH))).Times(1);
@@ -840,7 +840,7 @@ TEST_F(FeedTransactionTest, PubTransactionWithOwnerFund)
.WillByDefault(testing::Return(accountRoot.getSerializer().peekData()));
static constexpr auto kTRANSACTION_FOR_OWNER_FUND =
R"({
R"JSON({
"transaction":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -875,7 +875,7 @@ TEST_F(FeedTransactionTest, PubTransactionWithOwnerFund)
"close_time_iso": "2000-01-01T00:00:00Z",
"engine_result":"tesSUCCESS",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
EXPECT_CALL(*mockSessionPtr, apiSubversion).WillOnce(testing::Return(1));
EXPECT_CALL(*mockSessionPtr, send(sharedStringJsonEq(kTRANSACTION_FOR_OWNER_FUND))).Times(1);
@@ -886,7 +886,7 @@ TEST_F(FeedTransactionTest, PubTransactionWithOwnerFund)
}
static constexpr auto kTRAN_FROZEN =
R"({
R"JSON({
"transaction":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -920,7 +920,7 @@ static constexpr auto kTRAN_FROZEN =
"engine_result_code":0,
"engine_result":"tesSUCCESS",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
TEST_F(FeedTransactionTest, PubTransactionOfferCreationFrozenLine)
{
@@ -1146,7 +1146,7 @@ TEST_F(FeedTransactionTest, PubTransactionWithOwnerFundFrozenLPToken)
.WillRepeatedly(testing::Return(ammAccountRoot.getSerializer().peekData()));
static constexpr auto kTRANSACTION_FOR_OWNER_FUND =
R"({
R"JSON({
"transaction":
{
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
@@ -1181,7 +1181,7 @@ TEST_F(FeedTransactionTest, PubTransactionWithOwnerFundFrozenLPToken)
"close_time_iso": "2000-01-01T00:00:00Z",
"engine_result":"tesSUCCESS",
"engine_result_message":"The transaction was applied. Only final in a validated ledger."
})";
})JSON";
EXPECT_CALL(*mockSessionPtr, apiSubversion).WillOnce(testing::Return(1));
EXPECT_CALL(*mockSessionPtr, send(sharedStringJsonEq(kTRANSACTION_FOR_OWNER_FUND))).Times(1);