From d97f19ba1db223e9fa2eab8d847f3f50f8d7417a Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 27 Jun 2025 11:45:11 +0100 Subject: [PATCH] style: Fix JSON style in C++ code (#2262) --- tests/common/util/config/FakeConfigData.hpp | 20 +- tests/unit/feed/BookChangesFeedTests.cpp | 24 +- tests/unit/feed/ForwardFeedTests.cpp | 2 +- tests/unit/feed/LedgerFeedTests.cpp | 46 +- .../feed/ProposedTransactionFeedTests.cpp | 20 +- tests/unit/feed/SingleFeedBaseTests.cpp | 2 +- tests/unit/feed/SubscriptionManagerTests.cpp | 214 ++--- tests/unit/feed/TransactionFeedTests.cpp | 504 +++++------ tests/unit/rpc/BaseTests.cpp | 8 +- tests/unit/rpc/RPCEngineTests.cpp | 2 +- .../rpc/handlers/AccountChannelsTests.cpp | 90 +- .../rpc/handlers/AccountCurrenciesTests.cpp | 32 +- tests/unit/rpc/handlers/AccountInfoTests.cpp | 18 +- tests/unit/rpc/handlers/AccountNFTsTests.cpp | 120 +-- .../unit/rpc/handlers/AccountObjectsTests.cpp | 350 ++++---- .../unit/rpc/handlers/AccountOffersTests.cpp | 60 +- tests/unit/rpc/handlers/AccountTxTests.cpp | 2 +- tests/unit/rpc/handlers/BookOffersTests.cpp | 802 +++++++++--------- .../rpc/handlers/GatewayBalancesTests.cpp | 20 +- .../rpc/handlers/GetAggregatePriceTests.cpp | 12 +- tests/unit/rpc/handlers/LedgerDataTests.cpp | 128 +-- tests/unit/rpc/handlers/LedgerEntryTests.cpp | 164 ++-- tests/unit/rpc/handlers/LedgerTests.cpp | 278 +++--- tests/unit/rpc/handlers/MPTHoldersTests.cpp | 12 +- tests/unit/rpc/handlers/NFTHistoryTests.cpp | 112 +-- tests/unit/rpc/handlers/NFTsByIssuerTest.cpp | 2 +- .../unit/rpc/handlers/NoRippleCheckTests.cpp | 82 +- tests/unit/rpc/handlers/SubscribeTests.cpp | 116 +-- .../rpc/handlers/TransactionEntryTests.cpp | 2 +- tests/unit/rpc/handlers/TxTests.cpp | 124 +-- tests/unit/rpc/handlers/UnsubscribeTests.cpp | 6 +- .../unit/util/config/ConfigFileJsonTests.cpp | 2 +- tests/unit/web/RPCServerHandlerTests.cpp | 18 +- tests/unit/web/ng/RPCServerHandlerTests.cpp | 16 +- 34 files changed, 1705 insertions(+), 1705 deletions(-) diff --git a/tests/common/util/config/FakeConfigData.hpp b/tests/common/util/config/FakeConfigData.hpp index a796b9a9..06dc4708 100644 --- a/tests/common/util/config/FakeConfigData.hpp +++ b/tests/common/util/config/FakeConfigData.hpp @@ -85,7 +85,7 @@ generateConfig() } } ], - "dosguard": { + "dosguard": { "whitelist": [ // mandatory for user to include ], @@ -132,16 +132,16 @@ static constexpr auto kJSON_DATA = R"JSON({ } } ], - "dosguard": { + "dosguard": { "whitelist": [ "125.5.5.1", "204.2.2.1" ], - "port" : 44444 + "port": 44444 }, - "optional" : { - "withDefault" : 0.0 + "optional": { + "withDefault": 0.0 }, - "requireValue" : "required" + "requireValue": "required" })JSON"; /* After parsing jsonValue and populating it into ClioConfig, It will look like this below in json format; @@ -177,7 +177,7 @@ static constexpr auto kJSON_DATA = R"JSON({ } } ], - "dosguard": { + "dosguard": { "whitelist": [ "125.5.5.1", "204.2.2.1" ], @@ -203,8 +203,8 @@ static constexpr auto kINVALID_JSON_DATA = R"JSON({ ] }, "idk": true, - "requireValue" : "required", - "optional" : { - "withDefault" : "0.0" + "requireValue": "required", + "optional": { + "withDefault": "0.0" } })JSON"; diff --git a/tests/unit/feed/BookChangesFeedTests.cpp b/tests/unit/feed/BookChangesFeedTests.cpp index c7480b3d..3bad15a8 100644 --- a/tests/unit/feed/BookChangesFeedTests.cpp +++ b/tests/unit/feed/BookChangesFeedTests.cpp @@ -62,21 +62,21 @@ TEST_F(FeedBookChangeTest, Pub) static constexpr auto kBOOK_CHANGE_PUBLISH = R"JSON({ - "type":"bookChanges", - "ledger_index":32, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_time":0, + "type": "bookChanges", + "ledger_index": 32, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_time": 0, "changes": [ { - "currency_a":"XRP_drops", - "currency_b":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD/0158415500000000C1F76FF6ECB0BAC600000000", - "volume_a":"2", - "volume_b":"2", - "high":"-1", - "low":"-1", - "open":"-1", - "close":"-1" + "currency_a": "XRP_drops", + "currency_b": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD/0158415500000000C1F76FF6ECB0BAC600000000", + "volume_a": "2", + "volume_b": "2", + "high": "-1", + "low": "-1", + "open": "-1", + "close": "-1" } ] })JSON"; diff --git a/tests/unit/feed/ForwardFeedTests.cpp b/tests/unit/feed/ForwardFeedTests.cpp index 7bbf4fe8..a1056cf9 100644 --- a/tests/unit/feed/ForwardFeedTests.cpp +++ b/tests/unit/feed/ForwardFeedTests.cpp @@ -34,7 +34,7 @@ using namespace util::prometheus; namespace { -constexpr auto kFEED = R"JSON({"test":"test"})JSON"; +constexpr auto kFEED = R"JSON({"test": "test"})JSON"; } // namespace diff --git a/tests/unit/feed/LedgerFeedTests.cpp b/tests/unit/feed/LedgerFeedTests.cpp index 007a91da..cc9762a7 100644 --- a/tests/unit/feed/LedgerFeedTests.cpp +++ b/tests/unit/feed/LedgerFeedTests.cpp @@ -53,13 +53,13 @@ TEST_F(FeedLedgerTest, SubPub) // the type and txn_count fields static constexpr auto kLEDGER_RESPONSE = R"JSON({ - "validated_ledgers":"10-30", - "ledger_index":30, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_time":0, - "fee_base":1, - "reserve_base":3, - "reserve_inc":2 + "validated_ledgers": "10-30", + "ledger_index": 30, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_time": 0, + "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) { @@ -73,15 +73,15 @@ TEST_F(FeedLedgerTest, SubPub) static constexpr auto kLEDGER_PUB = R"JSON({ - "type":"ledgerClosed", - "ledger_index":31, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_time":0, - "fee_base":0, - "reserve_base":10, - "reserve_inc":0, - "validated_ledgers":"10-31", - "txn_count":8 + "type": "ledgerClosed", + "ledger_index": 31, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_time": 0, + "fee_base": 0, + "reserve_base": 10, + "reserve_inc": 0, + "validated_ledgers": "10-31", + "txn_count": 8 })JSON"; // test publish @@ -108,13 +108,13 @@ TEST_F(FeedLedgerTest, AutoDisconnect) EXPECT_CALL(*backend_, doFetchLedgerObject).WillOnce(testing::Return(feeBlob)); static constexpr auto kLEDGER_RESPONSE = R"JSON({ - "validated_ledgers":"10-30", - "ledger_index":30, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_time":0, - "fee_base":1, - "reserve_base":3, - "reserve_inc":2 + "validated_ledgers": "10-30", + "ledger_index": 30, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_time": 0, + "fee_base": 1, + "reserve_base": 3, + "reserve_inc": 2 })JSON"; web::SubscriptionContextInterface::OnDisconnectSlot slot; diff --git a/tests/unit/feed/ProposedTransactionFeedTests.cpp b/tests/unit/feed/ProposedTransactionFeedTests.cpp index 3126c5b3..da2f580d 100644 --- a/tests/unit/feed/ProposedTransactionFeedTests.cpp +++ b/tests/unit/feed/ProposedTransactionFeedTests.cpp @@ -43,16 +43,16 @@ constexpr auto kDUMMY_TRANSACTION = R"JSON({ "transaction": { - "Account":"rh1HPuRVsYYvThxG2Bs1MfjmrVC73S16Fb", - "Amount":"40000000", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"20", - "Flags":2147483648, - "Sequence":13767283, - "SigningPubKey":"036F3CFFE1EA77C1EEC5DCCA38C83E62E3AC068F8A16369620AF1D609BA5A620B2", - "TransactionType":"Payment", - "TxnSignature":"30450221009BD0D563B24E50B26A42F30455AD21C3D5CD4D80174C41F7B54969FFC08DE94C02201FC35320B56D56D1E34D1D281D48AC68CBEDDD6EE9DFA639CCB08BB251453A87", - "hash":"F44393295DB860C6860769C16F5B23887762F09F87A8D1174E0FCFF9E7247F07" + "Account": "rh1HPuRVsYYvThxG2Bs1MfjmrVC73S16Fb", + "Amount": "40000000", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "20", + "Flags": 2147483648, + "Sequence": 13767283, + "SigningPubKey": "036F3CFFE1EA77C1EEC5DCCA38C83E62E3AC068F8A16369620AF1D609BA5A620B2", + "TransactionType": "Payment", + "TxnSignature": "30450221009BD0D563B24E50B26A42F30455AD21C3D5CD4D80174C41F7B54969FFC08DE94C02201FC35320B56D56D1E34D1D281D48AC68CBEDDD6EE9DFA639CCB08BB251453A87", + "hash": "F44393295DB860C6860769C16F5B23887762F09F87A8D1174E0FCFF9E7247F07" } })JSON"; diff --git a/tests/unit/feed/SingleFeedBaseTests.cpp b/tests/unit/feed/SingleFeedBaseTests.cpp index 18566075..40405c99 100644 --- a/tests/unit/feed/SingleFeedBaseTests.cpp +++ b/tests/unit/feed/SingleFeedBaseTests.cpp @@ -32,7 +32,7 @@ #include namespace { -constexpr auto kFEED = R"JSON({"test":"test"})JSON"; +constexpr auto kFEED = R"JSON({"test": "test"})JSON"; } // namespace using namespace feed::impl; diff --git a/tests/unit/feed/SubscriptionManagerTests.cpp b/tests/unit/feed/SubscriptionManagerTests.cpp index 522c597a..b657ae54 100644 --- a/tests/unit/feed/SubscriptionManagerTests.cpp +++ b/tests/unit/feed/SubscriptionManagerTests.cpp @@ -93,8 +93,8 @@ TEST_F(SubscriptionManagerAsyncTest, MultipleThreadCtx) EXPECT_CALL(*sessionPtr_, onDisconnect); subscriptionManagerPtr_->subValidation(session_); - static constexpr auto kJSON_MANIFEST = R"JSON({"manifest":"test"})JSON"; - static constexpr auto kJSON_VALIDATION = R"JSON({"validation":"test"})JSON"; + 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)); @@ -112,23 +112,23 @@ TEST_F(SubscriptionManagerAsyncTest, MultipleThreadCtxSessionDieEarly) EXPECT_CALL(*sessionPtr_, send(testing::_)).Times(0); session_.reset(); - subscriptionManagerPtr_->forwardManifest(json::parse(R"JSON({"manifest":"test"})JSON").get_object()); - subscriptionManagerPtr_->forwardValidation(json::parse(R"JSON({"validation":"test"})JSON").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"JSON({ - "ledger":0, - "transactions":2, - "transactions_proposed":2, - "manifests":2, - "validations":2, - "account":2, - "accounts_proposed":2, - "books":2, - "book_changes":2 + "ledger": 0, + "transactions": 2, + "transactions_proposed": 2, + "manifests": 2, + "validations": 2, + "account": 2, + "accounts_proposed": 2, + "books": 2, + "book_changes": 2 })JSON"; web::SubscriptionContextPtr const session1 = std::make_shared(); MockSession* mockSession1 = dynamic_cast(session1.get()); @@ -201,7 +201,7 @@ TEST_F(SubscriptionManagerTest, ReportCurrentSubscriber) TEST_F(SubscriptionManagerTest, ManifestTest) { - static constexpr auto kDUMMY_MANIFEST = R"JSON({"manifest":"test"})JSON"; + static constexpr auto kDUMMY_MANIFEST = R"JSON({"manifest": "test"})JSON"; EXPECT_CALL(*sessionPtr_, onDisconnect); EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDUMMY_MANIFEST))); subscriptionManagerPtr_->subManifest(session_); @@ -214,7 +214,7 @@ TEST_F(SubscriptionManagerTest, ManifestTest) TEST_F(SubscriptionManagerTest, ValidationTest) { - static constexpr auto kDUMMY = R"JSON({"validation":"test"})JSON"; + static constexpr auto kDUMMY = R"JSON({"validation": "test"})JSON"; EXPECT_CALL(*sessionPtr_, onDisconnect); EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDUMMY))); subscriptionManagerPtr_->subValidation(session_); @@ -242,21 +242,21 @@ TEST_F(SubscriptionManagerTest, BookChangesTest) transactions.push_back(trans1); static constexpr auto kBOOK_CHANGE_PUBLISH = R"JSON({ - "type":"bookChanges", - "ledger_index":32, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_time":0, + "type": "bookChanges", + "ledger_index": 32, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_time": 0, "changes": [ { - "currency_a":"XRP_drops", - "currency_b":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD/0158415500000000C1F76FF6ECB0BAC600000000", - "volume_a":"2", - "volume_b":"2", - "high":"-1", - "low":"-1", - "open":"-1", - "close":"-1" + "currency_a": "XRP_drops", + "currency_b": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD/0158415500000000C1F76FF6ECB0BAC600000000", + "volume_a": "2", + "volume_b": "2", + "high": "-1", + "low": "-1", + "open": "-1", + "close": "-1" } ] })JSON"; @@ -282,13 +282,13 @@ TEST_F(SubscriptionManagerTest, LedgerTest) // the type and txn_count fields static constexpr auto kLEDGER_RESPONSE = R"JSON({ - "validated_ledgers":"10-30", - "ledger_index":30, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_time":0, - "fee_base":1, - "reserve_base":3, - "reserve_inc":2 + "validated_ledgers": "10-30", + "ledger_index": 30, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_time": 0, + "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) { @@ -306,15 +306,15 @@ TEST_F(SubscriptionManagerTest, LedgerTest) fee2.reserve = 10; static constexpr auto kLEDGER_PUB = R"JSON({ - "type":"ledgerClosed", - "ledger_index":31, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_time":0, - "fee_base":0, - "reserve_base":10, - "reserve_inc":0, - "validated_ledgers":"10-31", - "txn_count":8 + "type": "ledgerClosed", + "ledger_index": 31, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_time": 0, + "fee_base": 0, + "reserve_base": 10, + "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); @@ -349,16 +349,16 @@ TEST_F(SubscriptionManagerTest, TransactionTest) R"JSON({ "transaction": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Amount":"1", - "DeliverMax":"1", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "hash":"51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", - "date":0 + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Amount": "1", + "DeliverMax": "1", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "hash": "51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", + "date": 0 }, "meta": { @@ -369,42 +369,42 @@ TEST_F(SubscriptionManagerTest, TransactionTest) { "FinalFields": { - "TakerGets":"3", + "TakerGets": "3", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"1" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "1" } }, - "LedgerEntryType":"Offer", + "LedgerEntryType": "Offer", "PreviousFields": { - "TakerGets":"1", + "TakerGets": "1", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"3" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "3" } } } } ], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "engine_result_code":0, - "engine_result":"tesSUCCESS", + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "engine_result_code": 0, + "engine_result": "tesSUCCESS", "close_time_iso": "2000-01-01T00:00:00Z", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "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)); @@ -431,24 +431,24 @@ TEST_F(SubscriptionManagerTest, ProposedTransactionTest) R"JSON({ "transaction": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun" + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun" } })JSON"; static constexpr auto kORDERBOOK_PUBLISH = R"JSON({ "transaction": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Amount":"1", - "DeliverMax":"1", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "hash":"51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", - "date":0 + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Amount": "1", + "DeliverMax": "1", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "hash": "51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", + "date": 0 }, "meta": { @@ -459,42 +459,42 @@ TEST_F(SubscriptionManagerTest, ProposedTransactionTest) { "FinalFields": { - "TakerGets":"3", + "TakerGets": "3", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"1" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "1" } }, - "LedgerEntryType":"Offer", + "LedgerEntryType": "Offer", "PreviousFields": { - "TakerGets":"1", + "TakerGets": "1", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"3" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "3" } } } } ], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "engine_result_code":0, - "engine_result":"tesSUCCESS", + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "engine_result_code": 0, + "engine_result": "tesSUCCESS", "close_time_iso": "2000-01-01T00:00:00Z", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "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); diff --git a/tests/unit/feed/TransactionFeedTests.cpp b/tests/unit/feed/TransactionFeedTests.cpp index b095949d..100c1dcd 100644 --- a/tests/unit/feed/TransactionFeedTests.cpp +++ b/tests/unit/feed/TransactionFeedTests.cpp @@ -64,16 +64,16 @@ constexpr auto kTRAN_V1 = R"JSON({ "transaction": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Amount":"1", - "DeliverMax":"1", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "hash":"51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", - "date":0 + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Amount": "1", + "DeliverMax": "1", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "hash": "51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", + "date": 0 }, "meta": { @@ -84,10 +84,10 @@ constexpr auto kTRAN_V1 = { "FinalFields": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Balance":"110" + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Balance": "110" }, - "LedgerEntryType":"AccountRoot" + "LedgerEntryType": "AccountRoot" } }, { @@ -95,80 +95,80 @@ constexpr auto kTRAN_V1 = { "FinalFields": { - "Account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Balance":"30" + "Account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Balance": "30" }, - "LedgerEntryType":"AccountRoot" + "LedgerEntryType": "AccountRoot" } } ], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, "close_time_iso": "2000-01-01T00:00:00Z", - "ledger_hash":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "engine_result_code":0, - "engine_result":"tesSUCCESS", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "ledger_hash": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "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"JSON({ "tx_json": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "DeliverMax":"1", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "date":0 + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "DeliverMax": "1", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "date": 0 }, "meta": { "AffectedNodes": [ { - "ModifiedNode":{ - "FinalFields":{ - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Balance":"110" + "ModifiedNode": { + "FinalFields": { + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Balance": "110" }, - "LedgerEntryType":"AccountRoot" + "LedgerEntryType": "AccountRoot" } }, { - "ModifiedNode":{ - "FinalFields":{ - "Account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Balance":"30" + "ModifiedNode": { + "FinalFields": { + "Account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Balance": "30" }, - "LedgerEntryType":"AccountRoot" + "LedgerEntryType": "AccountRoot" } } ], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, "close_time_iso": "2000-01-01T00:00:00Z", - "ledger_hash":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "hash":"51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", - "engine_result_code":0, - "engine_result":"tesSUCCESS", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "ledger_hash": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "hash": "51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", + "engine_result_code": 0, + "engine_result": "tesSUCCESS", + "engine_result_message": "The transaction was applied. Only final in a validated ledger." })JSON"; } // namespace @@ -370,16 +370,16 @@ TEST_F(FeedTransactionTest, SubBookV1) R"JSON({ "transaction": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Amount":"1", - "DeliverMax":"1", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "hash":"51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", - "date":0 + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Amount": "1", + "DeliverMax": "1", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "hash": "51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", + "date": 0 }, "meta": { @@ -390,41 +390,41 @@ TEST_F(FeedTransactionTest, SubBookV1) { "FinalFields": { - "TakerGets":"3", + "TakerGets": "3", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"1" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "1" } }, - "LedgerEntryType":"Offer", - "PreviousFields":{ - "TakerGets":"1", + "LedgerEntryType": "Offer", + "PreviousFields": { + "TakerGets": "1", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"3" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "3" } } } } ], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, - "ledger_hash":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "engine_result_code":0, - "engine_result":"tesSUCCESS", + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, + "ledger_hash": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "engine_result_code": 0, + "engine_result": "tesSUCCESS", "close_time_iso": "2000-01-01T00:00:00Z", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "engine_result_message": "The transaction was applied. Only final in a validated ledger." })JSON"; EXPECT_CALL(*mockSessionPtr, apiSubversion).WillOnce(testing::Return(1)); @@ -437,19 +437,19 @@ TEST_F(FeedTransactionTest, SubBookV1) static constexpr auto kORDERBOOK_CANCEL_PUBLISH = R"JSON({ - "transaction":{ - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Amount":"1", - "DeliverMax":"1", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "hash":"51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", - "date":0 + "transaction": { + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Amount": "1", + "DeliverMax": "1", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "hash": "51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", + "date": 0 }, - "meta":{ + "meta": { "AffectedNodes": [ { @@ -457,31 +457,31 @@ TEST_F(FeedTransactionTest, SubBookV1) { "FinalFields": { - "TakerGets":"3", - "TakerPays":{ - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"1" + "TakerGets": "3", + "TakerPays": { + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "1" } }, - "LedgerEntryType":"Offer" + "LedgerEntryType": "Offer" } } ], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, - "ledger_hash":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "engine_result_code":0, - "engine_result":"tesSUCCESS", + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, + "ledger_hash": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "engine_result_code": 0, + "engine_result": "tesSUCCESS", "close_time_iso": "2000-01-01T00:00:00Z", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "engine_result_message": "The transaction was applied. Only final in a validated ledger." })JSON"; EXPECT_CALL(*mockSessionPtr, apiSubversion).WillOnce(testing::Return(1)); @@ -493,16 +493,16 @@ TEST_F(FeedTransactionTest, SubBookV1) R"JSON({ "transaction": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Amount":"1", - "DeliverMax":"1", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "hash":"51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", - "date":0 + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Amount": "1", + "DeliverMax": "1", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "hash": "51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", + "date": 0 }, "meta": { @@ -511,33 +511,33 @@ TEST_F(FeedTransactionTest, SubBookV1) { "CreatedNode": { - "NewFields":{ - "TakerGets":"3", + "NewFields": { + "TakerGets": "3", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"1" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "1" } }, - "LedgerEntryType":"Offer" + "LedgerEntryType": "Offer" } } ], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, - "ledger_hash":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "engine_result_code":0, - "engine_result":"tesSUCCESS", + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, + "ledger_hash": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "engine_result_code": 0, + "engine_result": "tesSUCCESS", "close_time_iso": "2000-01-01T00:00:00Z", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "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(); @@ -574,14 +574,14 @@ TEST_F(FeedTransactionTest, SubBookV2) R"JSON({ "tx_json": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "DeliverMax":"1", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "date":0 + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "DeliverMax": "1", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "date": 0 }, "meta": { @@ -592,43 +592,43 @@ TEST_F(FeedTransactionTest, SubBookV2) { "FinalFields": { - "TakerGets":"3", + "TakerGets": "3", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"1" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "1" } }, - "LedgerEntryType":"Offer", + "LedgerEntryType": "Offer", "PreviousFields": { - "TakerGets":"1", + "TakerGets": "1", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"3" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "3" } } } } ], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, - "ledger_hash":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "engine_result_code":0, - "engine_result":"tesSUCCESS", + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, + "ledger_hash": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "engine_result_code": 0, + "engine_result": "tesSUCCESS", "close_time_iso": "2000-01-01T00:00:00Z", - "hash":"51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "hash": "51D2AAA6B8E4E16EF22F6424854283D8391B56875858A711B8CE4D5B9A422CC2", + "engine_result_message": "The transaction was applied. Only final in a validated ledger." })JSON"; EXPECT_CALL(*mockSessionPtr, apiSubversion).WillOnce(testing::Return(2)); @@ -844,38 +844,38 @@ TEST_F(FeedTransactionTest, PubTransactionWithOwnerFund) R"JSON({ "transaction": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", "TakerGets": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"1" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "1" }, - "TakerPays":"3", - "TransactionType":"OfferCreate", - "hash":"EE8775B43A67F4803DECEC5E918E0EA9C56D8ED93E512EBE9F2891846509AAAB", - "date":0, - "owner_funds":"100" + "TakerPays": "3", + "TransactionType": "OfferCreate", + "hash": "EE8775B43A67F4803DECEC5E918E0EA9C56D8ED93E512EBE9F2891846509AAAB", + "date": 0, + "owner_funds": "100" }, "meta": { - "AffectedNodes":[], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS" + "AffectedNodes": [], + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, - "ledger_hash":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "engine_result_code":0, + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, + "ledger_hash": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "engine_result_code": 0, "close_time_iso": "2000-01-01T00:00:00Z", - "engine_result":"tesSUCCESS", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "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)); @@ -890,37 +890,37 @@ static constexpr auto kTRAN_FROZEN = R"JSON({ "transaction": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", "TakerGets": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", - "value":"1" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rK9DrarGKnVEo2nYp5MfVRXRYf5yRX3mwD", + "value": "1" }, - "TakerPays":"3", - "TransactionType":"OfferCreate", - "hash":"EE8775B43A67F4803DECEC5E918E0EA9C56D8ED93E512EBE9F2891846509AAAB", - "date":0, - "owner_funds":"0" + "TakerPays": "3", + "TransactionType": "OfferCreate", + "hash": "EE8775B43A67F4803DECEC5E918E0EA9C56D8ED93E512EBE9F2891846509AAAB", + "date": 0, + "owner_funds": "0" }, - "meta":{ - "AffectedNodes":[], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS" + "meta": { + "AffectedNodes": [], + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, "close_time_iso": "2000-01-01T00:00:00Z", - "ledger_hash":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "engine_result_code":0, - "engine_result":"tesSUCCESS", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "ledger_hash": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "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) @@ -1150,38 +1150,38 @@ TEST_F(FeedTransactionTest, PubTransactionWithOwnerFundFrozenLPToken) R"JSON({ "transaction": { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Fee":"1", - "Sequence":32, - "SigningPubKey":"74657374", + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Fee": "1", + "Sequence": 32, + "SigningPubKey": "74657374", "TakerGets": { - "currency":"037C35306B24AAB7FF90848206E003279AA47090", - "issuer":"rnW8FAPgpQgA6VoESnVrUVJHBdq9QAtRZs", - "value":"1" + "currency": "037C35306B24AAB7FF90848206E003279AA47090", + "issuer": "rnW8FAPgpQgA6VoESnVrUVJHBdq9QAtRZs", + "value": "1" }, - "TakerPays":"3", - "TransactionType":"OfferCreate", - "hash":"9CA8BBF209DC4505F593A1EA0DC2135A5FA2C6541AF19D128B046873E0CEB695", - "date":0, - "owner_funds":"0" + "TakerPays": "3", + "TransactionType": "OfferCreate", + "hash": "9CA8BBF209DC4505F593A1EA0DC2135A5FA2C6541AF19D128B046873E0CEB695", + "date": 0, + "owner_funds": "0" }, "meta": { - "AffectedNodes":[], - "TransactionIndex":22, - "TransactionResult":"tesSUCCESS" + "AffectedNodes": [], + "TransactionIndex": 22, + "TransactionResult": "tesSUCCESS" }, - "ctid":"C000002100160000", - "type":"transaction", - "validated":true, - "status":"closed", - "ledger_index":33, - "ledger_hash":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "engine_result_code":0, + "ctid": "C000002100160000", + "type": "transaction", + "validated": true, + "status": "closed", + "ledger_index": 33, + "ledger_hash": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "engine_result_code": 0, "close_time_iso": "2000-01-01T00:00:00Z", - "engine_result":"tesSUCCESS", - "engine_result_message":"The transaction was applied. Only final in a validated ledger." + "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)); diff --git a/tests/unit/rpc/BaseTests.cpp b/tests/unit/rpc/BaseTests.cpp index 51d6fe3c..a0a696ef 100644 --- a/tests/unit/rpc/BaseTests.cpp +++ b/tests/unit/rpc/BaseTests.cpp @@ -277,7 +277,7 @@ TEST_F(RPCBaseTest, ArrayAtValidator) auto failingInput = json::parse(R"JSON({ "arr": [{"limit": "not int"}] })JSON"); ASSERT_FALSE(spec.process(failingInput)); - failingInput = json::parse(R"JSON({ "arr": [{"limit": 42}] ,"arr2": "not array type" })JSON"); + failingInput = json::parse(R"JSON({ "arr": [{"limit": 42}], "arr2": "not array type" })JSON"); ASSERT_FALSE(spec.process(failingInput)); failingInput = json::parse(R"JSON({ "arr": [] })JSON"); @@ -323,7 +323,7 @@ TEST_F(RPCBaseTest, IfTypeValidator) failingInput = json::parse(R"JSON({ "mix": 1213 })JSON"); ASSERT_FALSE(spec.process(failingInput)); - failingInput = json::parse(R"JSON({ "mix": {"limit": 42, "limit2": 22} , "mix2": 1213 })JSON"); + failingInput = json::parse(R"JSON({ "mix": {"limit": 42, "limit2": 22}, "mix2": 1213 })JSON"); ASSERT_FALSE(spec.process(failingInput)); } @@ -585,7 +585,7 @@ TEST_F(RPCBaseTest, CurrencyValidator) ASSERT_TRUE(spec.process(passingInput)); for (auto const& currency : {"[]<", ">()", "{}|", "?!@", "#$%", "^&*"}) { - passingInput = json::parse(fmt::format(R"JSON({{ "currency" : "{}" }})JSON", currency)); + passingInput = json::parse(fmt::format(R"JSON({{ "currency": "{}" }})JSON", currency)); ASSERT_TRUE(spec.process(passingInput)); } @@ -652,7 +652,7 @@ TEST_F(RPCBaseTest, SubscribeAccountsValidator) { auto const spec = RpcSpec{{"accounts", CustomValidators::subscribeAccountsValidator}}; auto passingInput = json::parse( - R"JSON({ "accounts": ["rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun"]})JSON" + R"JSON({ "accounts": ["rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun"]})JSON" ); ASSERT_TRUE(spec.process(passingInput)); diff --git a/tests/unit/rpc/RPCEngineTests.cpp b/tests/unit/rpc/RPCEngineTests.cpp index d924fedc..30192fe5 100644 --- a/tests/unit/rpc/RPCEngineTests.cpp +++ b/tests/unit/rpc/RPCEngineTests.cpp @@ -485,7 +485,7 @@ TEST_F(RPCEngineTest, NotCacheIfErrorHappen) yield, method, 1, - boost::json::parse(R"JSON({"hello": "world","limit": 50})JSON").as_object(), + boost::json::parse(R"JSON({"hello": "world", "limit": 50})JSON").as_object(), nullptr, tagFactory, LedgerRange{.minSequence = 0, .maxSequence = 30}, diff --git a/tests/unit/rpc/handlers/AccountChannelsTests.cpp b/tests/unit/rpc/handlers/AccountChannelsTests.cpp index fc50abf6..9bc84a17 100644 --- a/tests/unit/rpc/handlers/AccountChannelsTests.cpp +++ b/tests/unit/rpc/handlers/AccountChannelsTests.cpp @@ -427,31 +427,31 @@ TEST_F(RPCAccountChannelsHandlerTest, NonExistAccount) TEST_F(RPCAccountChannelsHandlerTest, DefaultParameterTest) { static constexpr auto kCORRECT_OUTPUT = R"JSON({ - "account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "limit":200, - "channels":[ + "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "limit": 200, + "channels": [ { - "channel_id":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "destination_account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "amount":"100", - "balance":"10", - "settle_delay":32, - "public_key":"aBMxWrnPUnvwZPfsmTyVizxEGsGheAu3Tsn6oPRgyjgvd2NggFxz", - "public_key_hex":"020000000000000000000000000000000000000000000000000000000000000000" + "channel_id": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "destination_account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "amount": "100", + "balance": "10", + "settle_delay": 32, + "public_key": "aBMxWrnPUnvwZPfsmTyVizxEGsGheAu3Tsn6oPRgyjgvd2NggFxz", + "public_key_hex": "020000000000000000000000000000000000000000000000000000000000000000" }, { - "channel_id":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC322", - "account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "destination_account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "amount":"100", - "balance":"10", - "settle_delay":32, - "public_key":"aBMxWrnPUnvwZPfsmTyVizxEGsGheAu3Tsn6oPRgyjgvd2NggFxz", - "public_key_hex":"020000000000000000000000000000000000000000000000000000000000000000" + "channel_id": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC322", + "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "destination_account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "amount": "100", + "balance": "10", + "settle_delay": 32, + "public_key": "aBMxWrnPUnvwZPfsmTyVizxEGsGheAu3Tsn6oPRgyjgvd2NggFxz", + "public_key_hex": "020000000000000000000000000000000000000000000000000000000000000000" } ] })JSON"; @@ -623,7 +623,7 @@ TEST_F(RPCAccountChannelsHandlerTest, UseDestination) R"JSON({{ "account": "{}", "limit": 30, - "destination_account":"{}" + "destination_account": "{}" }})JSON", kACCOUNT, kACCOUNT3 @@ -674,35 +674,35 @@ TEST_F(RPCAccountChannelsHandlerTest, EmptyChannel) TEST_F(RPCAccountChannelsHandlerTest, OptionalResponseField) { static constexpr auto kCORRECT_OUTPUT = R"JSON({ - "account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "limit":200, - "channels":[ + "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "limit": 200, + "channels": [ { - "channel_id":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "destination_account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "amount":"100", - "balance":"10", - "settle_delay":32, - "public_key":"aBMxWrnPUnvwZPfsmTyVizxEGsGheAu3Tsn6oPRgyjgvd2NggFxz", - "public_key_hex":"020000000000000000000000000000000000000000000000000000000000000000", + "channel_id": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "destination_account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "amount": "100", + "balance": "10", + "settle_delay": 32, + "public_key": "aBMxWrnPUnvwZPfsmTyVizxEGsGheAu3Tsn6oPRgyjgvd2NggFxz", + "public_key_hex": "020000000000000000000000000000000000000000000000000000000000000000", "expiration": 100, "cancel_after": 200, "source_tag": 300, "destination_tag": 400 }, { - "channel_id":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC322", - "account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "destination_account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "amount":"100", - "balance":"10", - "settle_delay":32, - "public_key":"aBMxWrnPUnvwZPfsmTyVizxEGsGheAu3Tsn6oPRgyjgvd2NggFxz", - "public_key_hex":"020000000000000000000000000000000000000000000000000000000000000000", + "channel_id": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC322", + "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "destination_account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "amount": "100", + "balance": "10", + "settle_delay": 32, + "public_key": "aBMxWrnPUnvwZPfsmTyVizxEGsGheAu3Tsn6oPRgyjgvd2NggFxz", + "public_key_hex": "020000000000000000000000000000000000000000000000000000000000000000", "expiration": 100, "cancel_after": 200, "source_tag": 300, diff --git a/tests/unit/rpc/handlers/AccountCurrenciesTests.cpp b/tests/unit/rpc/handlers/AccountCurrenciesTests.cpp index ac7990af..f27c80ef 100644 --- a/tests/unit/rpc/handlers/AccountCurrenciesTests.cpp +++ b/tests/unit/rpc/handlers/AccountCurrenciesTests.cpp @@ -75,7 +75,7 @@ TEST_F(RPCAccountCurrenciesHandlerTest, AccountNotExist) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -97,7 +97,7 @@ TEST_F(RPCAccountCurrenciesHandlerTest, LedgerNonExistViaIntSequence) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -121,8 +121,8 @@ TEST_F(RPCAccountCurrenciesHandlerTest, LedgerNonExistViaStringSequence) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_index":"{}" + "account": "{}", + "ledger_index": "{}" }})JSON", kACCOUNT, kSEQ @@ -146,8 +146,8 @@ TEST_F(RPCAccountCurrenciesHandlerTest, LedgerNonExistViaHash) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_hash":"{}" + "account": "{}", + "ledger_hash": "{}" }})JSON", kACCOUNT, kLEDGER_HASH @@ -165,14 +165,14 @@ TEST_F(RPCAccountCurrenciesHandlerTest, LedgerNonExistViaHash) TEST_F(RPCAccountCurrenciesHandlerTest, DefaultParameter) { static constexpr auto kOUTPUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "receive_currencies":[ + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "receive_currencies": [ "EUR", "JPY" ], - "send_currencies":[ + "send_currencies": [ "EUR", "USD" ] @@ -212,7 +212,7 @@ TEST_F(RPCAccountCurrenciesHandlerTest, DefaultParameter) EXPECT_CALL(*backend_, doFetchLedgerObjects).Times(1); static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -247,8 +247,8 @@ TEST_F(RPCAccountCurrenciesHandlerTest, RequestViaLegderHash) EXPECT_CALL(*backend_, doFetchLedgerObjects).Times(1); static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_hash":"{}" + "account": "{}", + "ledger_hash": "{}" }})JSON", kACCOUNT, kLEDGER_HASH @@ -284,8 +284,8 @@ TEST_F(RPCAccountCurrenciesHandlerTest, RequestViaLegderSeq) EXPECT_CALL(*backend_, doFetchLedgerObjects).Times(1); static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_index":{} + "account": "{}", + "ledger_index": {} }})JSON", kACCOUNT, ledgerSeq diff --git a/tests/unit/rpc/handlers/AccountInfoTests.cpp b/tests/unit/rpc/handlers/AccountInfoTests.cpp index 2f1a4fd0..fef1517a 100644 --- a/tests/unit/rpc/handlers/AccountInfoTests.cpp +++ b/tests/unit/rpc/handlers/AccountInfoTests.cpp @@ -90,49 +90,49 @@ generateTestValuesForParametersTest() }, AccountInfoParamTestCaseBundle{ .testName = "AccountNotString", - .testJson = R"JSON({"account":1})JSON", + .testJson = R"JSON({"account": 1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "accountNotString" }, AccountInfoParamTestCaseBundle{ .testName = "AccountInvalid", - .testJson = R"JSON({"account":"xxx"})JSON", + .testJson = R"JSON({"account": "xxx"})JSON", .expectedError = "actMalformed", .expectedErrorMessage = "accountMalformed" }, AccountInfoParamTestCaseBundle{ .testName = "IdentNotString", - .testJson = R"JSON({"ident":1})JSON", + .testJson = R"JSON({"ident": 1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "identNotString" }, AccountInfoParamTestCaseBundle{ .testName = "IdentInvalid", - .testJson = R"JSON({"ident":"xxx"})JSON", + .testJson = R"JSON({"ident": "xxx"})JSON", .expectedError = "actMalformed", .expectedErrorMessage = "identMalformed" }, AccountInfoParamTestCaseBundle{ .testName = "SignerListsInvalid", - .testJson = R"JSON({"ident":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "signer_lists":1})JSON", + .testJson = R"JSON({"ident": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "signer_lists": 1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, AccountInfoParamTestCaseBundle{ .testName = "LedgerHashInvalid", - .testJson = R"JSON({"ident":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_hash":"1"})JSON", + .testJson = R"JSON({"ident": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_hash": "1"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "ledger_hashMalformed" }, AccountInfoParamTestCaseBundle{ .testName = "LedgerHashNotString", - .testJson = R"JSON({"ident":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_hash":1})JSON", + .testJson = R"JSON({"ident": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_hash": 1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "ledger_hashNotString" }, AccountInfoParamTestCaseBundle{ .testName = "LedgerIndexInvalid", - .testJson = R"JSON({"ident":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_index":"a"})JSON", + .testJson = R"JSON({"ident": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_index": "a"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "ledgerIndexMalformed" }, @@ -164,7 +164,7 @@ TEST_P(AccountInfoParameterTest, InvalidParams) TEST_F(AccountInfoParameterTest, ApiV1SignerListIsNotBool) { static constexpr auto kREQ_JSON = R"JSON( - {"ident":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "signer_lists":1} + {"ident": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "signer_lists": 1} )JSON"; EXPECT_CALL(*backend_, fetchLedgerBySequence); diff --git a/tests/unit/rpc/handlers/AccountNFTsTests.cpp b/tests/unit/rpc/handlers/AccountNFTsTests.cpp index 49ad67d5..757593eb 100644 --- a/tests/unit/rpc/handlers/AccountNFTsTests.cpp +++ b/tests/unit/rpc/handlers/AccountNFTsTests.cpp @@ -183,8 +183,8 @@ TEST_F(RPCAccountNFTsHandlerTest, LedgerNotFoundViaHash) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_hash":"{}" + "account": "{}", + "ledger_hash": "{}" }})JSON", kACCOUNT, kLEDGER_HASH @@ -209,8 +209,8 @@ TEST_F(RPCAccountNFTsHandlerTest, LedgerNotFoundViaStringIndex) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_index":"{}" + "account": "{}", + "ledger_index": "{}" }})JSON", kACCOUNT, kSEQ @@ -235,8 +235,8 @@ TEST_F(RPCAccountNFTsHandlerTest, LedgerNotFoundViaIntIndex) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_index":{} + "account": "{}", + "ledger_index": {} }})JSON", kACCOUNT, kSEQ @@ -262,7 +262,7 @@ TEST_F(RPCAccountNFTsHandlerTest, AccountNotFound) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -280,22 +280,22 @@ TEST_F(RPCAccountNFTsHandlerTest, NormalPath) { static auto const kEXPECTED_OUTPUT = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":30, - "validated":true, - "account":"{}", - "account_nfts":[ + "ledger_hash": "{}", + "ledger_index": 30, + "validated": true, + "account": "{}", + "account_nfts": [ {{ - "NFTokenID":"{}", - "URI":"7777772E6F6B2E636F6D", - "Flags":{}, - "Issuer":"{}", - "NFTokenTaxon":{}, - "nft_serial":{}, - "TransferFee":10000 + "NFTokenID": "{}", + "URI": "7777772E6F6B2E636F6D", + "Flags": {}, + "Issuer": "{}", + "NFTokenTaxon": {}, + "nft_serial": {}, + "TransferFee": 10000 }} ], - "limit":100 + "limit": 100 }})JSON", kLEDGER_HASH, kACCOUNT, @@ -325,7 +325,7 @@ TEST_F(RPCAccountNFTsHandlerTest, NormalPath) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -359,8 +359,8 @@ TEST_F(RPCAccountNFTsHandlerTest, Limit) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{} + "account": "{}", + "limit": {} }})JSON", kACCOUNT, kLIMIT @@ -394,8 +394,8 @@ TEST_F(RPCAccountNFTsHandlerTest, Marker) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "marker":"{}" + "account": "{}", + "marker": "{}" }})JSON", kACCOUNT, kPAGE @@ -421,8 +421,8 @@ TEST_F(RPCAccountNFTsHandlerTest, InvalidMarker) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "marker":"{}" + "account": "{}", + "marker": "{}" }})JSON", kACCOUNT, kINVALID_PAGE @@ -450,7 +450,7 @@ TEST_F(RPCAccountNFTsHandlerTest, AccountWithNoNFT) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -482,8 +482,8 @@ TEST_F(RPCAccountNFTsHandlerTest, invalidPage) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "marker":"{}" + "account": "{}", + "marker": "{}" }})JSON", kACCOUNT, kPAGE @@ -502,22 +502,22 @@ TEST_F(RPCAccountNFTsHandlerTest, LimitLessThanMin) { static auto const kEXPECTED_OUTPUT = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":30, - "validated":true, - "account":"{}", - "account_nfts":[ + "ledger_hash": "{}", + "ledger_index": 30, + "validated": true, + "account": "{}", + "account_nfts": [ {{ - "NFTokenID":"{}", - "URI":"7777772E6F6B2E636F6D", - "Flags":{}, - "Issuer":"{}", - "NFTokenTaxon":{}, - "nft_serial":{}, - "TransferFee":10000 + "NFTokenID": "{}", + "URI": "7777772E6F6B2E636F6D", + "Flags": {}, + "Issuer": "{}", + "NFTokenTaxon": {}, + "nft_serial": {}, + "TransferFee": 10000 }} ], - "limit":{} + "limit": {} }})JSON", kLEDGER_HASH, kACCOUNT, @@ -548,8 +548,8 @@ TEST_F(RPCAccountNFTsHandlerTest, LimitLessThanMin) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{} + "account": "{}", + "limit": {} }})JSON", kACCOUNT, AccountNFTsHandler::kLIMIT_MIN - 1 @@ -566,22 +566,22 @@ TEST_F(RPCAccountNFTsHandlerTest, LimitMoreThanMax) { static auto const kEXPECTED_OUTPUT = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":30, - "validated":true, - "account":"{}", - "account_nfts":[ + "ledger_hash": "{}", + "ledger_index": 30, + "validated": true, + "account": "{}", + "account_nfts": [ {{ - "NFTokenID":"{}", - "URI":"7777772E6F6B2E636F6D", - "Flags":{}, - "Issuer":"{}", - "NFTokenTaxon":{}, - "nft_serial":{}, - "TransferFee":10000 + "NFTokenID": "{}", + "URI": "7777772E6F6B2E636F6D", + "Flags": {}, + "Issuer": "{}", + "NFTokenTaxon": {}, + "nft_serial": {}, + "TransferFee": 10000 }} ], - "limit":{} + "limit": {} }})JSON", kLEDGER_HASH, kACCOUNT, @@ -612,8 +612,8 @@ TEST_F(RPCAccountNFTsHandlerTest, LimitMoreThanMax) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{} + "account": "{}", + "limit": {} }})JSON", kACCOUNT, AccountNFTsHandler::kLIMIT_MAX + 1 diff --git a/tests/unit/rpc/handlers/AccountObjectsTests.cpp b/tests/unit/rpc/handlers/AccountObjectsTests.cpp index 3a8b9076..d158bf68 100644 --- a/tests/unit/rpc/handlers/AccountObjectsTests.cpp +++ b/tests/unit/rpc/handlers/AccountObjectsTests.cpp @@ -96,86 +96,86 @@ generateTestValuesForParametersTest() }, AccountObjectsParamTestCaseBundle{ .testName = "AccountNotString", - .testJson = R"JSON({"account":1})JSON", + .testJson = R"JSON({"account": 1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "accountNotString" }, AccountObjectsParamTestCaseBundle{ .testName = "AccountInvalid", - .testJson = R"JSON({"account":"xxx"})JSON", + .testJson = R"JSON({"account": "xxx"})JSON", .expectedError = "actMalformed", .expectedErrorMessage = "accountMalformed" }, AccountObjectsParamTestCaseBundle{ .testName = "TypeNotString", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "type":1})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "type": 1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, AccountObjectsParamTestCaseBundle{ .testName = "TypeInvalid", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "type":"wrong"})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "type": "wrong"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid field 'type'." }, AccountObjectsParamTestCaseBundle{ .testName = "TypeNotAccountOwned", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "type":"amendments"})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "type": "amendments"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid field 'type'." }, AccountObjectsParamTestCaseBundle{ .testName = "LedgerHashInvalid", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_hash":"1"})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_hash": "1"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "ledger_hashMalformed" }, AccountObjectsParamTestCaseBundle{ .testName = "LedgerHashNotString", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_hash":1})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_hash": 1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "ledger_hashNotString" }, AccountObjectsParamTestCaseBundle{ .testName = "LedgerIndexInvalid", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_index":"a"})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_index": "a"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "ledgerIndexMalformed" }, AccountObjectsParamTestCaseBundle{ .testName = "LimitNotInt", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "limit":"1"})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "limit": "1"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, AccountObjectsParamTestCaseBundle{ .testName = "LimitNegative", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "limit":-1})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "limit":-1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, AccountObjectsParamTestCaseBundle{ .testName = "LimitZero", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "limit":0})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "limit": 0})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, AccountObjectsParamTestCaseBundle{ .testName = "MarkerNotString", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "marker":9})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "marker": 9})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "markerNotString" }, AccountObjectsParamTestCaseBundle{ .testName = "MarkerInvalid", - .testJson = R"JSON({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "marker":"xxxx"})JSON", + .testJson = R"JSON({"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "marker": "xxxx"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Malformed cursor." }, AccountObjectsParamTestCaseBundle{ .testName = "NFTMarkerInvalid", .testJson = fmt::format( - R"JSON({{"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "marker":"wronghex256,{}"}})JSON", + R"JSON({{"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "marker": "wronghex256,{}"}})JSON", std::numeric_limits::max() ), .expectedError = "invalidParams", @@ -225,8 +225,8 @@ TEST_F(RPCAccountObjectsHandlerTest, LedgerNonExistViaIntSequence) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_index":30 + "account": "{}", + "ledger_index": 30 }})JSON", kACCOUNT )); @@ -247,8 +247,8 @@ TEST_F(RPCAccountObjectsHandlerTest, LedgerNonExistViaStringSequence) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_index":"30" + "account": "{}", + "ledger_index": "30" }})JSON", kACCOUNT )); @@ -270,8 +270,8 @@ TEST_F(RPCAccountObjectsHandlerTest, LedgerNonExistViaHash) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_hash":"{}" + "account": "{}", + "ledger_hash": "{}" }})JSON", kACCOUNT, kLEDGER_HASH @@ -295,7 +295,7 @@ TEST_F(RPCAccountObjectsHandlerTest, AccountNotExist) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -312,33 +312,33 @@ TEST_F(RPCAccountObjectsHandlerTest, AccountNotExist) TEST_F(RPCAccountObjectsHandlerTest, DefaultParameterNoNFTFound) { static constexpr auto kEXPECTED_OUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "limit": 200, - "account_objects":[ + "account_objects": [ { - "Balance":{ - "currency":"USD", - "issuer":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW", - "value":"100" + "Balance": { + "currency": "USD", + "issuer": "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW", + "value": "100" }, - "Flags":0, - "HighLimit":{ - "currency":"USD", - "issuer":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "value":"20" + "Flags": 0, + "HighLimit": { + "currency": "USD", + "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "value": "20" }, - "LedgerEntryType":"RippleState", - "LowLimit":{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "LedgerEntryType": "RippleState", + "LowLimit": { + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }, - "PreviousTxnID":"E3FE6EA3D48F0C2B639448020EA4F03D4F4F8FFDB243A852A0F59177921B4879", - "PreviousTxnLgrSeq":123, - "index":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" + "PreviousTxnID": "E3FE6EA3D48F0C2B639448020EA4F03D4F4F8FFDB243A852A0F59177921B4879", + "PreviousTxnLgrSeq": 123, + "index": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" } ] })JSON"; @@ -367,7 +367,7 @@ TEST_F(RPCAccountObjectsHandlerTest, DefaultParameterNoNFTFound) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -411,8 +411,8 @@ TEST_F(RPCAccountObjectsHandlerTest, Limit) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{} + "account": "{}", + "limit": {} }})JSON", kACCOUNT, kLIMIT @@ -455,8 +455,8 @@ TEST_F(RPCAccountObjectsHandlerTest, Marker) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "marker":"{},{}" + "account": "{}", + "marker": "{},{}" }})JSON", kACCOUNT, kINDEX1, @@ -509,8 +509,8 @@ TEST_F(RPCAccountObjectsHandlerTest, MultipleDirNoNFT) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{} + "account": "{}", + "limit": {} }})JSON", kACCOUNT, 2 * kCOUNT @@ -563,8 +563,8 @@ TEST_F(RPCAccountObjectsHandlerTest, TypeFilter) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "type":"offer" + "account": "{}", + "type": "offer" }})JSON", kACCOUNT )); @@ -660,7 +660,7 @@ TEST_F(RPCAccountObjectsHandlerTest, TypeFilterReturnEmpty) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", + "account": "{}", "type": "check" }})JSON", kACCOUNT @@ -898,64 +898,64 @@ TEST_F(RPCAccountObjectsHandlerTest, DeletionBlockersOnlyFilterWithIncompatibleT TEST_F(RPCAccountObjectsHandlerTest, NFTMixOtherObjects) { static constexpr auto kEXPECTED_OUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "limit": 200, - "account_objects":[ + "account_objects": [ { - "Flags":0, - "LedgerEntryType":"NFTokenPage", - "NFTokens":[ + "Flags": 0, + "LedgerEntryType": "NFTokenPage", + "NFTokens": [ { - "NFToken":{ - "NFTokenID":"000827103B94ECBB7BF0A0A6ED62B3607801A27B65F4679F4AD1D4850000C0EA", - "URI":"7777772E6F6B2E636F6D" + "NFToken": { + "NFTokenID": "000827103B94ECBB7BF0A0A6ED62B3607801A27B65F4679F4AD1D4850000C0EA", + "URI": "7777772E6F6B2E636F6D" } } ], - "PreviousPageMin":"4B4E9C06F24296074F7BC48F92A97916C6DC5EA9659B25014D08E1BC983515BC", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "index":"4B4E9C06F24296074F7BC48F92A97916C6DC5EA9FFFFFFFFFFFFFFFFFFFFFFFF" + "PreviousPageMin": "4B4E9C06F24296074F7BC48F92A97916C6DC5EA9659B25014D08E1BC983515BC", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "index": "4B4E9C06F24296074F7BC48F92A97916C6DC5EA9FFFFFFFFFFFFFFFFFFFFFFFF" }, { - "Flags":0, - "LedgerEntryType":"NFTokenPage", - "NFTokens":[ + "Flags": 0, + "LedgerEntryType": "NFTokenPage", + "NFTokens": [ { - "NFToken":{ - "NFTokenID":"000827103B94ECBB7BF0A0A6ED62B3607801A27B65F4679F4AD1D4850000C0EA", - "URI":"7777772E6F6B2E636F6D" + "NFToken": { + "NFTokenID": "000827103B94ECBB7BF0A0A6ED62B3607801A27B65F4679F4AD1D4850000C0EA", + "URI": "7777772E6F6B2E636F6D" } } ], - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "index":"4B4E9C06F24296074F7BC48F92A97916C6DC5EA9659B25014D08E1BC983515BC" + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "index": "4B4E9C06F24296074F7BC48F92A97916C6DC5EA9659B25014D08E1BC983515BC" }, { - "Balance":{ - "currency":"USD", - "issuer":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW", - "value":"100" + "Balance": { + "currency": "USD", + "issuer": "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW", + "value": "100" }, - "Flags":0, - "HighLimit":{ - "currency":"USD", - "issuer":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "value":"20" + "Flags": 0, + "HighLimit": { + "currency": "USD", + "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "value": "20" }, - "LedgerEntryType":"RippleState", - "LowLimit":{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "LedgerEntryType": "RippleState", + "LowLimit": { + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }, - "PreviousTxnID":"E3FE6EA3D48F0C2B639448020EA4F03D4F4F8FFDB243A852A0F59177921B4879", - "PreviousTxnLgrSeq":123, - "index":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" + "PreviousTxnID": "E3FE6EA3D48F0C2B639448020EA4F03D4F4F8FFDB243A852A0F59177921B4879", + "PreviousTxnLgrSeq": 123, + "index": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" } ] })JSON"; @@ -994,7 +994,7 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTMixOtherObjects) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -1033,8 +1033,8 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTReachLimitReturnMarker) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{} + "account": "{}", + "limit": {} }})JSON", kACCOUNT, 10 @@ -1082,8 +1082,8 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTReachLimitNoMarker) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{} + "account": "{}", + "limit": {} }})JSON", kACCOUNT, 11 @@ -1160,8 +1160,8 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTMarker) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "marker":"{},{}" + "account": "{}", + "marker": "{},{}" }})JSON", kACCOUNT, ripple::strHex(marker), @@ -1216,8 +1216,8 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTMarkerNoMoreNFT) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "marker":"{},{}" + "account": "{}", + "marker": "{},{}" }})JSON", kACCOUNT, ripple::strHex(ripple::uint256{beast::zero}), @@ -1245,7 +1245,7 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTMarkerNotInRange) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ "account": "{}", - "marker" : "{},{}" + "marker": "{},{}" }})JSON", kACCOUNT, kINDEX1, @@ -1278,7 +1278,7 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTMarkerNotExist) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ "account": "{}", - "marker" : "{},{}" + "marker": "{},{}" }})JSON", kACCOUNT, ripple::strHex(accountNftMax), @@ -1351,8 +1351,8 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTLimitAdjust) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "marker":"{},{}", + "account": "{}", + "marker": "{},{}", "limit": 12 }})JSON", kACCOUNT, @@ -1373,42 +1373,42 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTLimitAdjust) TEST_F(RPCAccountObjectsHandlerTest, FilterNFT) { static constexpr auto kEXPECTED_OUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "limit": 200, - "account_objects":[ + "account_objects": [ { - "Flags":0, - "LedgerEntryType":"NFTokenPage", - "NFTokens":[ + "Flags": 0, + "LedgerEntryType": "NFTokenPage", + "NFTokens": [ { - "NFToken":{ - "NFTokenID":"000827103B94ECBB7BF0A0A6ED62B3607801A27B65F4679F4AD1D4850000C0EA", - "URI":"7777772E6F6B2E636F6D" + "NFToken": { + "NFTokenID": "000827103B94ECBB7BF0A0A6ED62B3607801A27B65F4679F4AD1D4850000C0EA", + "URI": "7777772E6F6B2E636F6D" } } ], - "PreviousPageMin":"4B4E9C06F24296074F7BC48F92A97916C6DC5EA9659B25014D08E1BC983515BC", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "index":"4B4E9C06F24296074F7BC48F92A97916C6DC5EA9FFFFFFFFFFFFFFFFFFFFFFFF" + "PreviousPageMin": "4B4E9C06F24296074F7BC48F92A97916C6DC5EA9659B25014D08E1BC983515BC", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "index": "4B4E9C06F24296074F7BC48F92A97916C6DC5EA9FFFFFFFFFFFFFFFFFFFFFFFF" }, { - "Flags":0, - "LedgerEntryType":"NFTokenPage", - "NFTokens":[ + "Flags": 0, + "LedgerEntryType": "NFTokenPage", + "NFTokens": [ { - "NFToken":{ - "NFTokenID":"000827103B94ECBB7BF0A0A6ED62B3607801A27B65F4679F4AD1D4850000C0EA", - "URI":"7777772E6F6B2E636F6D" + "NFToken": { + "NFTokenID": "000827103B94ECBB7BF0A0A6ED62B3607801A27B65F4679F4AD1D4850000C0EA", + "URI": "7777772E6F6B2E636F6D" } } ], - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "index":"4B4E9C06F24296074F7BC48F92A97916C6DC5EA9659B25014D08E1BC983515BC" + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "index": "4B4E9C06F24296074F7BC48F92A97916C6DC5EA9659B25014D08E1BC983515BC" } ] })JSON"; @@ -1447,7 +1447,7 @@ TEST_F(RPCAccountObjectsHandlerTest, FilterNFT) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", + "account": "{}", "type": "nft_page" }})JSON", kACCOUNT @@ -1488,8 +1488,8 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTZeroMarkerNotAffectOtherMarker) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{}, + "account": "{}", + "limit": {}, "marker": "{},{}" }})JSON", kACCOUNT, @@ -1511,33 +1511,33 @@ TEST_F(RPCAccountObjectsHandlerTest, LimitLessThanMin) { static auto const kEXPECTED_OUT = fmt::format( R"JSON({{ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "limit": {}, - "account_objects":[ + "account_objects": [ {{ - "Balance":{{ - "currency":"USD", - "issuer":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW", - "value":"100" + "Balance": {{ + "currency": "USD", + "issuer": "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW", + "value": "100" }}, - "Flags":0, - "HighLimit":{{ - "currency":"USD", - "issuer":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "value":"20" + "Flags": 0, + "HighLimit": {{ + "currency": "USD", + "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "value": "20" }}, - "LedgerEntryType":"RippleState", - "LowLimit":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "LedgerEntryType": "RippleState", + "LowLimit": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "PreviousTxnID":"E3FE6EA3D48F0C2B639448020EA4F03D4F4F8FFDB243A852A0F59177921B4879", - "PreviousTxnLgrSeq":123, - "index":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" + "PreviousTxnID": "E3FE6EA3D48F0C2B639448020EA4F03D4F4F8FFDB243A852A0F59177921B4879", + "PreviousTxnLgrSeq": 123, + "index": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" }} ] }})JSON", @@ -1568,7 +1568,7 @@ TEST_F(RPCAccountObjectsHandlerTest, LimitLessThanMin) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", + "account": "{}", "limit": {} }})JSON", kACCOUNT, @@ -1587,33 +1587,33 @@ TEST_F(RPCAccountObjectsHandlerTest, LimitMoreThanMax) { static auto const kEXPECTED_OUT = fmt::format( R"JSON({{ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "limit": {}, - "account_objects":[ + "account_objects": [ {{ - "Balance":{{ - "currency":"USD", - "issuer":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW", - "value":"100" + "Balance": {{ + "currency": "USD", + "issuer": "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW", + "value": "100" }}, - "Flags":0, - "HighLimit":{{ - "currency":"USD", - "issuer":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "value":"20" + "Flags": 0, + "HighLimit": {{ + "currency": "USD", + "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "value": "20" }}, - "LedgerEntryType":"RippleState", - "LowLimit":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "LedgerEntryType": "RippleState", + "LowLimit": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "PreviousTxnID":"E3FE6EA3D48F0C2B639448020EA4F03D4F4F8FFDB243A852A0F59177921B4879", - "PreviousTxnLgrSeq":123, - "index":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" + "PreviousTxnID": "E3FE6EA3D48F0C2B639448020EA4F03D4F4F8FFDB243A852A0F59177921B4879", + "PreviousTxnLgrSeq": 123, + "index": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" }} ] }})JSON", @@ -1644,7 +1644,7 @@ TEST_F(RPCAccountObjectsHandlerTest, LimitMoreThanMax) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", + "account": "{}", "limit": {} }})JSON", kACCOUNT, diff --git a/tests/unit/rpc/handlers/AccountOffersTests.cpp b/tests/unit/rpc/handlers/AccountOffersTests.cpp index 373d38a8..e3ac62a0 100644 --- a/tests/unit/rpc/handlers/AccountOffersTests.cpp +++ b/tests/unit/rpc/handlers/AccountOffersTests.cpp @@ -178,8 +178,8 @@ TEST_F(RPCAccountOffersHandlerTest, LedgerNotFoundViaHash) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_hash":"{}" + "account": "{}", + "ledger_hash": "{}" }})JSON", kACCOUNT, kLEDGER_HASH @@ -204,8 +204,8 @@ TEST_F(RPCAccountOffersHandlerTest, LedgerNotFoundViaStringIndex) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_index":"{}" + "account": "{}", + "ledger_index": "{}" }})JSON", kACCOUNT, kSEQ @@ -230,8 +230,8 @@ TEST_F(RPCAccountOffersHandlerTest, LedgerNotFoundViaIntIndex) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "ledger_index":{} + "account": "{}", + "ledger_index": {} }})JSON", kACCOUNT, kSEQ @@ -257,7 +257,7 @@ TEST_F(RPCAccountOffersHandlerTest, AccountNotFound) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -275,24 +275,24 @@ TEST_F(RPCAccountOffersHandlerTest, DefaultParams) { auto const expectedOutput = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":30, - "validated":true, - "account":"{}", + "ledger_hash": "{}", + "ledger_index": 30, + "validated": true, + "account": "{}", "offers": [ {{ - "seq":0, - "flags":0, - "quality":"0.000000024999999374023", - "taker_pays":"20", + "seq": 0, + "flags": 0, + "quality": "0.000000024999999374023", + "taker_pays": "20", "taker_gets": {{ - "currency":"USD", - "issuer":"{}", - "value":"10" + "currency": "USD", + "issuer": "{}", + "value": "10" }}, - "expiration":123 + "expiration": 123 }} ] }})JSON", @@ -334,7 +334,7 @@ TEST_F(RPCAccountOffersHandlerTest, DefaultParams) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}" + "account": "{}" }})JSON", kACCOUNT )); @@ -382,8 +382,8 @@ TEST_F(RPCAccountOffersHandlerTest, Limit) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":10 + "account": "{}", + "limit": 10 }})JSON", kACCOUNT )); @@ -435,8 +435,8 @@ TEST_F(RPCAccountOffersHandlerTest, Marker) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "marker":"{},{}" + "account": "{}", + "marker": "{},{}" }})JSON", kACCOUNT, kINDEX1, @@ -471,8 +471,8 @@ TEST_F(RPCAccountOffersHandlerTest, MarkerNotExists) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "marker":"{},{}" + "account": "{}", + "marker": "{},{}" }})JSON", kACCOUNT, kINDEX1, @@ -529,8 +529,8 @@ TEST_F(RPCAccountOffersHandlerTest, LimitLessThanMin) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{} + "account": "{}", + "limit": {} }})JSON", kACCOUNT, AccountOffersHandler::kLIMIT_MIN - 1 @@ -584,8 +584,8 @@ TEST_F(RPCAccountOffersHandlerTest, LimitMoreThanMax) static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "account":"{}", - "limit":{} + "account": "{}", + "limit": {} }})JSON", kACCOUNT, AccountOffersHandler::kLIMIT_MAX + 1 diff --git a/tests/unit/rpc/handlers/AccountTxTests.cpp b/tests/unit/rpc/handlers/AccountTxTests.cpp index e9337398..e51df9bc 100644 --- a/tests/unit/rpc/handlers/AccountTxTests.cpp +++ b/tests/unit/rpc/handlers/AccountTxTests.cpp @@ -791,7 +791,7 @@ TEST_F(RPCAccountTxHandlerTest, LimitAndMarker) "ledger_index_max": {}, "limit": 2, "forward": false, - "marker": {{"ledger":10,"seq":11}} + "marker": {{"ledger": 10, "seq": 11}} }})JSON", kACCOUNT, -1, diff --git a/tests/unit/rpc/handlers/BookOffersTests.cpp b/tests/unit/rpc/handlers/BookOffersTests.cpp index 9ff8b305..1752586e 100644 --- a/tests/unit/rpc/handlers/BookOffersTests.cpp +++ b/tests/unit/rpc/handlers/BookOffersTests.cpp @@ -114,10 +114,10 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "MissingTakerGets", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "USD", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "USD", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" } })JSON", .expectedError = "invalidParams", @@ -126,10 +126,10 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "MissingTakerPays", .testJson = R"JSON({ - "taker_gets" : + "taker_gets": { - "currency" : "USD", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "USD", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" } })JSON", .expectedError = "invalidParams", @@ -138,10 +138,10 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "WrongTypeTakerPays", .testJson = R"JSON({ - "taker_pays" : "wrong", - "taker_gets" : + "taker_pays": "wrong", + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "invalidParams", @@ -150,10 +150,10 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "WrongTypeTakerGets", .testJson = R"JSON({ - "taker_gets" : "wrong", - "taker_pays" : + "taker_gets": "wrong", + "taker_pays": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "invalidParams", @@ -162,10 +162,10 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "TakerPaysMissingCurrency", .testJson = R"JSON({ - "taker_pays" : {}, - "taker_gets" : + "taker_pays": {}, + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "invalidParams", @@ -174,10 +174,10 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "TakerGetsMissingCurrency", .testJson = R"JSON({ - "taker_gets" : {}, - "taker_pays" : + "taker_gets": {}, + "taker_pays": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "invalidParams", @@ -186,14 +186,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "TakerGetsWrongCurrency", .testJson = R"JSON({ - "taker_gets" : + "taker_gets": { - "currency" : "CNYY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNYY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_pays" : + "taker_pays": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "dstAmtMalformed", @@ -202,14 +202,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "TakerPaysWrongCurrency", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNYY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNYY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "srcCurMalformed", @@ -218,14 +218,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "TakerGetsCurrencyNotString", .testJson = R"JSON({ - "taker_gets" : + "taker_gets": { - "currency" : 123, - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": 123, + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_pays" : + "taker_pays": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "dstAmtMalformed", @@ -234,14 +234,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "TakerPaysCurrencyNotString", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : 123, - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": 123, + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "srcCurMalformed", @@ -250,14 +250,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "TakerGetsWrongIssuer", .testJson = R"JSON({ - "taker_gets" : + "taker_gets": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs5" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs5" }, - "taker_pays" : + "taker_pays": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "dstIsrMalformed", @@ -266,14 +266,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "TakerPaysWrongIssuer", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs5" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs5" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" } })JSON", .expectedError = "srcIsrMalformed", @@ -282,14 +282,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "InvalidTaker", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "taker": "123" })JSON", @@ -299,14 +299,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "TakerNotString", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "taker": 123 })JSON", @@ -316,14 +316,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "Domain_InvalidType", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "domain": 0 })JSON", @@ -333,14 +333,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "Domain_InvalidInt", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "domain": "123" })JSON", @@ -350,14 +350,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "Domain_InvalidObject", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "domain": {} })JSON", @@ -367,14 +367,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "LimitNotInt", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "limit": "123" })JSON", @@ -384,14 +384,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "LimitNegative", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "limit": -1 })JSON", @@ -401,14 +401,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "LimitZero", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "limit": 0 })JSON", @@ -418,14 +418,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "LedgerIndexInvalid", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "ledger_index": "xxx" })JSON", @@ -435,14 +435,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "LedgerHashInvalid", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "ledger_hash": "xxx" })JSON", @@ -452,14 +452,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "LedgerHashNotString", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP" + "currency": "XRP" }, "ledger_hash": 123 })JSON", @@ -469,15 +469,15 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "GetsPaysXRPWithIssuer", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "XRP", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "XRP", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "CNY", - "issuer" : "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn" + "currency": "CNY", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn" } })JSON", .expectedError = "srcIsrMalformed", @@ -486,14 +486,14 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "PaysCurrencyWithXRPIssuer", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "JPY" + "currency": "JPY" }, - "taker_gets" : + "taker_gets": { - "currency" : "CNY", - "issuer" : "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn" + "currency": "CNY", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn" } })JSON", .expectedError = "srcIsrMalformed", @@ -502,13 +502,13 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "GetsCurrencyWithXRPIssuer", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "XRP" + "currency": "XRP" }, - "taker_gets" : + "taker_gets": { - "currency" : "CNY" + "currency": "CNY" } })JSON", .expectedError = "dstIsrMalformed", @@ -517,15 +517,15 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "GetsXRPWithIssuer", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "XRP", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "XRP", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" } })JSON", .expectedError = "dstIsrMalformed", @@ -534,15 +534,15 @@ generateParameterBookOffersTestBundles() ParameterTestBundle{ .testName = "BadMarket", .testJson = R"JSON({ - "taker_pays" : + "taker_pays": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" }, - "taker_gets" : + "taker_gets": { - "currency" : "CNY", - "issuer" : "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" + "currency": "CNY", + "issuer": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B" } })JSON", .expectedError = "badMarket", @@ -770,28 +770,28 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10XRPPays20USDOffer}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, - "offers":[ + "ledger_hash": "{}", + "ledger_index": 300, + "offers": [ {{ - "Account":"{}", - "BookDirectory":"43B83ADC452B85FCBADA6CAEAC5181C255A213630D58FFD455071AFD498D0000", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerGets":"10", - "TakerPays":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"20" + "Account": "{}", + "BookDirectory": "43B83ADC452B85FCBADA6CAEAC5181C255A213630D58FFD455071AFD498D0000", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerGets": "10", + "TakerPays": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "20" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}" }} ] }})JSON", @@ -830,34 +830,34 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10XRPPays20USDOffer}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"43B83ADC452B85FCBADA6CAEAC5181C255A213630D58FFD455071AFD498D0000", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerGets":"10", - "TakerPays":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"20" + "Account": "{}", + "BookDirectory": "43B83ADC452B85FCBADA6CAEAC5181C255A213630D58FFD455071AFD498D0000", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerGets": "10", + "TakerPays": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "20" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}", - "taker_gets_funded":"5", - "taker_pays_funded":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}", + "taker_gets_funded": "5", + "taker_pays_funded": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }} }} ] @@ -892,34 +892,34 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10XRPPays20USDOffer}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"43B83ADC452B85FCBADA6CAEAC5181C255A213630D58FFD455071AFD498D0000", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerGets":"10", - "TakerPays":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"20" + "Account": "{}", + "BookDirectory": "43B83ADC452B85FCBADA6CAEAC5181C255A213630D58FFD455071AFD498D0000", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerGets": "10", + "TakerPays": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "20" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}", - "taker_gets_funded":"0", - "taker_pays_funded":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"0" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}", + "taker_gets_funded": "0", + "taker_pays_funded": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "0" }} }} ] @@ -954,35 +954,35 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10XRPPays20USDOfferWithDomain}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"43B83ADC452B85FCBADA6CAEAC5181C255A213630D58FFD455071AFD498D0000", - "BookNode":"0", + "Account": "{}", + "BookDirectory": "43B83ADC452B85FCBADA6CAEAC5181C255A213630D58FFD455071AFD498D0000", + "BookNode": "0", "DomainID": "F10D0CC9A0F9A3CBF585B80BE09A186483668FDBDD39AA7E3370F3649CE134E5", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerGets":"10", - "TakerPays":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"20" + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerGets": "10", + "TakerPays": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "20" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}", - "taker_gets_funded":"0", - "taker_pays_funded":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"0" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}", + "taker_gets_funded": "0", + "taker_pays_funded": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "0" }} }} ] @@ -1019,34 +1019,34 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10USDPays20XRPOffer}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerPays":"20", - "TakerGets":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerPays": "20", + "TakerGets": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}", - "taker_pays_funded":"0", - "taker_gets_funded":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"0" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}", + "taker_pays_funded": "0", + "taker_gets_funded": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "0" }} }} ] @@ -1085,35 +1085,35 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10USDPays20XRPOffer}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerPays":"20", - "TakerGets":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerPays": "20", + "TakerGets": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}", - "taker_gets_funded":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"4" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}", + "taker_gets_funded": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "4" }}, - "taker_pays_funded":"8" + "taker_pays_funded": "8" }} ] }})JSON", @@ -1160,54 +1160,54 @@ generateNormalPathBookOffersTestBundles() }, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerPays":"20", - "TakerGets":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerPays": "20", + "TakerGets": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}" }}, {{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerPays":"20", - "TakerGets":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerPays": "20", + "TakerGets": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "taker_gets_funded":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"5" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "taker_gets_funded": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "5" }}, - "taker_pays_funded":"10", - "quality":"{}" + "taker_pays_funded": "10", + "quality": "{}" }} ] }})JSON", @@ -1246,29 +1246,29 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10USDPays20XRPOwnerOffer}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerPays":"20", - "TakerGets":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerPays": "20", + "TakerGets": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}" }} ] }})JSON", @@ -1306,35 +1306,35 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10USDPays20XRPOffer}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerPays":"20", - "TakerGets":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerPays": "20", + "TakerGets": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}", - "taker_gets_funded":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"0" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}", + "taker_gets_funded": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "0" }}, - "taker_pays_funded":"0" + "taker_pays_funded": "0" }} ] }})JSON", @@ -1371,35 +1371,35 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10USDPays20XRPOffer}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerPays":"20", - "TakerGets":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerPays": "20", + "TakerGets": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}", - "taker_gets_funded":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"0" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}", + "taker_gets_funded": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "0" }}, - "taker_pays_funded":"0" + "taker_pays_funded": "0" }} ] }})JSON", @@ -1439,35 +1439,35 @@ generateNormalPathBookOffersTestBundles() .mockedOffers = std::vector{gets10USDPays20XRPOffer}, .expectedJson = fmt::format( R"JSON({{ - "ledger_hash":"{}", - "ledger_index":300, + "ledger_hash": "{}", + "ledger_index": 300, "offers": [ {{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerPays":"20", - "TakerGets":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"10" + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerPays": "20", + "TakerGets": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "10" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"{}", - "quality":"{}", - "taker_gets_funded":{{ - "currency":"USD", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"0" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "{}", + "quality": "{}", + "taker_gets_funded": {{ + "currency": "USD", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "0" }}, - "taker_pays_funded":"0" + "taker_pays_funded": "0" }} ] }})JSON", diff --git a/tests/unit/rpc/handlers/GatewayBalancesTests.cpp b/tests/unit/rpc/handlers/GatewayBalancesTests.cpp index dd4c0aa7..7f37b1d7 100644 --- a/tests/unit/rpc/handlers/GatewayBalancesTests.cpp +++ b/tests/unit/rpc/handlers/GatewayBalancesTests.cpp @@ -462,10 +462,10 @@ generateNormalPathTestBundles() }, .expectedJson = fmt::format( R"JSON({{ - "obligations":{{ + "obligations": {{ "JPY": "50" }}, - "balances":{{ + "balances": {{ "{}": [ {{ "currency": "USD", @@ -477,7 +477,7 @@ generateNormalPathTestBundles() }} ] }}, - "frozen_balances":{{ + "frozen_balances": {{ "{}": [ {{ "currency": "JPY", @@ -485,7 +485,7 @@ generateNormalPathTestBundles() }} ] }}, - "assets":{{ + "assets": {{ "{}": [ {{ "currency": "EUR", @@ -516,7 +516,7 @@ generateNormalPathTestBundles() )}, .expectedJson = fmt::format( R"JSON({{ - "obligations":{{ + "obligations": {{ "JPY": "50" }}, "account": "{}", @@ -533,7 +533,7 @@ generateNormalPathTestBundles() .mockedObjects = std::vector{overflowState, overflowState}, .expectedJson = fmt::format( R"JSON({{ - "obligations":{{ + "obligations": {{ "JPY": "9999999999999999e80" }}, "account": "{}", @@ -562,10 +562,10 @@ generateNormalPathTestBundles() }, .expectedJson = fmt::format( R"JSON({{ - "obligations":{{ + "obligations": {{ "EUR": "30" }}, - "balances":{{ + "balances": {{ "{}": [ {{ "currency": "USD", @@ -577,7 +577,7 @@ generateNormalPathTestBundles() }} ] }}, - "assets":{{ + "assets": {{ "{}": [ {{ "currency": "JPY", @@ -609,7 +609,7 @@ generateNormalPathTestBundles() }, .expectedJson = fmt::format( R"JSON({{ - "balances":{{ + "balances": {{ "{}": [ {{ "currency": "EUR", diff --git a/tests/unit/rpc/handlers/GetAggregatePriceTests.cpp b/tests/unit/rpc/handlers/GetAggregatePriceTests.cpp index dafb1501..a54f60d3 100644 --- a/tests/unit/rpc/handlers/GetAggregatePriceTests.cpp +++ b/tests/unit/rpc/handlers/GetAggregatePriceTests.cpp @@ -155,7 +155,7 @@ generateTestValuesForParametersTest() GetAggregatePriceParamTestCaseBundle{ .testName = "invalid_base_asset", .testJson = R"JSON({ - "quote_asset" : "USD", + "quote_asset": "USD", "base_asset": "asdf", "oracles": [ @@ -171,7 +171,7 @@ generateTestValuesForParametersTest() GetAggregatePriceParamTestCaseBundle{ .testName = "empty_base_asset", .testJson = R"JSON({ - "quote_asset" : "USD", + "quote_asset": "USD", "base_asset": "", "oracles": [ @@ -187,7 +187,7 @@ generateTestValuesForParametersTest() GetAggregatePriceParamTestCaseBundle{ .testName = "invalid_base_asset2", .testJson = R"JSON({ - "quote_asset" : "USD", + "quote_asset": "USD", "base_asset": "+aa", "oracles": [ @@ -218,7 +218,7 @@ generateTestValuesForParametersTest() GetAggregatePriceParamTestCaseBundle{ .testName = "invalid_quote_asset", .testJson = R"JSON({ - "quote_asset" : "asdf", + "quote_asset": "asdf", "base_asset": "USD", "oracles": [ @@ -234,7 +234,7 @@ generateTestValuesForParametersTest() GetAggregatePriceParamTestCaseBundle{ .testName = "empty_quote_asset", .testJson = R"JSON({ - "quote_asset" : "", + "quote_asset": "", "base_asset": "USD", "oracles": [ @@ -250,7 +250,7 @@ generateTestValuesForParametersTest() GetAggregatePriceParamTestCaseBundle{ .testName = "invalid_quote_asset2", .testJson = R"JSON({ - "quote_asset" : "+aa", + "quote_asset": "+aa", "base_asset": "USD", "oracles": [ diff --git a/tests/unit/rpc/handlers/LedgerDataTests.cpp b/tests/unit/rpc/handlers/LedgerDataTests.cpp index d02ce7d4..8b6b0a08 100644 --- a/tests/unit/rpc/handlers/LedgerDataTests.cpp +++ b/tests/unit/rpc/handlers/LedgerDataTests.cpp @@ -271,18 +271,18 @@ TEST_F(RPCLedgerDataHandlerTest, MarkerNotExist) TEST_F(RPCLedgerDataHandlerTest, NoMarker) { static auto const kLEDGER_EXPECTED = R"JSON({ - "account_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "close_flags":0, - "close_time":0, - "close_time_resolution":0, - "close_time_iso":"2000-01-01T00:00:00Z", - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":"30", - "parent_close_time":0, - "parent_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "total_coins":"0", - "transaction_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "closed":true + "account_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "close_flags": 0, + "close_time": 0, + "close_time_resolution": 0, + "close_time_iso": "2000-01-01T00:00:00Z", + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": "30", + "parent_close_time": 0, + "parent_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "total_coins": "0", + "transaction_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "closed": true })JSON"; EXPECT_CALL(*backend_, fetchLedgerBySequence).WillOnce(Return(createLedgerHeader(kLEDGER_HASH, kRANGE_MAX))); @@ -310,7 +310,7 @@ TEST_F(RPCLedgerDataHandlerTest, NoMarker) runSpawn([&, this](auto yield) { auto const handler = AnyHandler{LedgerDataHandler{backend_}}; - auto const req = json::parse(R"JSON({"limit":10})JSON"); + auto const req = json::parse(R"JSON({"limit": 10})JSON"); auto output = handler.process(req, Context{yield}); ASSERT_TRUE(output); EXPECT_TRUE(output.result->as_object().contains("ledger")); @@ -368,7 +368,7 @@ TEST_F(RPCLedgerDataHandlerTest, Version2) runSpawn([&, this](auto yield) { auto const handler = AnyHandler{LedgerDataHandler{backend_}}; - auto const req = json::parse(R"JSON({"limit":10})JSON"); + auto const req = json::parse(R"JSON({"limit": 10})JSON"); auto output = handler.process(req, Context{.yield = yield, .apiVersion = 2}); ASSERT_TRUE(output); EXPECT_TRUE(output.result->as_object().contains("ledger")); @@ -383,18 +383,18 @@ TEST_F(RPCLedgerDataHandlerTest, Version2) TEST_F(RPCLedgerDataHandlerTest, TypeFilter) { static auto const kLEDGER_EXPECTED = R"JSON({ - "account_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "close_flags":0, - "close_time":0, - "close_time_resolution":0, - "close_time_iso":"2000-01-01T00:00:00Z", - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":"30", - "parent_close_time":0, - "parent_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "total_coins":"0", - "transaction_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "closed":true + "account_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "close_flags": 0, + "close_time": 0, + "close_time_resolution": 0, + "close_time_iso": "2000-01-01T00:00:00Z", + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": "30", + "parent_close_time": 0, + "parent_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "total_coins": "0", + "transaction_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "closed": true })JSON"; EXPECT_CALL(*backend_, fetchLedgerBySequence).Times(1); @@ -425,8 +425,8 @@ TEST_F(RPCLedgerDataHandlerTest, TypeFilter) runSpawn([&, this](auto yield) { auto const handler = AnyHandler{LedgerDataHandler{backend_}}; auto const req = json::parse(R"JSON({ - "limit":10, - "type":"state" + "limit": 10, + "type": "state" })JSON"); auto output = handler.process(req, Context{yield}); @@ -447,18 +447,18 @@ TEST_F(RPCLedgerDataHandlerTest, TypeFilter) TEST_F(RPCLedgerDataHandlerTest, TypeFilterAMM) { static auto const kLEDGER_EXPECTED = R"JSON({ - "account_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "close_flags":0, - "close_time":0, - "close_time_resolution":0, - "close_time_iso":"2000-01-01T00:00:00Z", - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":"30", - "parent_close_time":0, - "parent_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "total_coins":"0", - "transaction_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "closed":true + "account_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "close_flags": 0, + "close_time": 0, + "close_time_resolution": 0, + "close_time_iso": "2000-01-01T00:00:00Z", + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": "30", + "parent_close_time": 0, + "parent_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "total_coins": "0", + "transaction_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "closed": true })JSON"; EXPECT_CALL(*backend_, fetchLedgerBySequence).Times(1); @@ -486,8 +486,8 @@ TEST_F(RPCLedgerDataHandlerTest, TypeFilterAMM) runSpawn([&, this](auto yield) { auto const handler = AnyHandler{LedgerDataHandler{backend_}}; auto const req = json::parse(R"JSON({ - "limit":6, - "type":"amm" + "limit": 6, + "type": "amm" })JSON"); auto output = handler.process(req, Context{yield}); @@ -508,18 +508,18 @@ TEST_F(RPCLedgerDataHandlerTest, TypeFilterAMM) TEST_F(RPCLedgerDataHandlerTest, OutOfOrder) { static auto const kLEDGER_EXPECTED = R"JSON({ - "account_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "close_flags":0, - "close_time":0, - "close_time_resolution":0, - "close_time_iso":"2000-01-01T00:00:00Z", - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":"30", - "parent_close_time":0, - "parent_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "total_coins":"0", - "transaction_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "closed":true + "account_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "close_flags": 0, + "close_time": 0, + "close_time_resolution": 0, + "close_time_iso": "2000-01-01T00:00:00Z", + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": "30", + "parent_close_time": 0, + "parent_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "total_coins": "0", + "transaction_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "closed": true })JSON"; EXPECT_CALL(*backend_, fetchLedgerBySequence).Times(1); @@ -542,7 +542,7 @@ TEST_F(RPCLedgerDataHandlerTest, OutOfOrder) runSpawn([&, this](auto yield) { auto const handler = AnyHandler{LedgerDataHandler{backend_}}; - auto const req = json::parse(R"JSON({"limit":10, "out_of_order":true})JSON"); + auto const req = json::parse(R"JSON({"limit": 10, "out_of_order": true})JSON"); auto output = handler.process(req, Context{yield}); ASSERT_TRUE(output); EXPECT_TRUE(output.result->as_object().contains("ledger")); @@ -590,7 +590,7 @@ TEST_F(RPCLedgerDataHandlerTest, Marker) auto const handler = AnyHandler{LedgerDataHandler{backend_}}; auto const req = json::parse(fmt::format( R"JSON({{ - "limit":10, + "limit": 10, "marker": "{}" }})JSON", kINDEX1 @@ -633,7 +633,7 @@ TEST_F(RPCLedgerDataHandlerTest, DiffMarker) auto const handler = AnyHandler{LedgerDataHandler{backend_}}; auto const req = json::parse(fmt::format( R"JSON({{ - "limit":10, + "limit": 10, "marker": {}, "out_of_order": true }})JSON", @@ -674,7 +674,7 @@ TEST_F(RPCLedgerDataHandlerTest, Binary) auto const handler = AnyHandler{LedgerDataHandler{backend_}}; auto const req = json::parse( R"JSON({ - "limit":10, + "limit": 10, "binary": true })JSON" ); @@ -714,7 +714,7 @@ TEST_F(RPCLedgerDataHandlerTest, BinaryLimitMoreThanMax) auto const handler = AnyHandler{LedgerDataHandler{backend_}}; auto const req = json::parse(fmt::format( R"JSON({{ - "limit":{}, + "limit": {}, "binary": true }})JSON", LedgerDataHandler::kLIMIT_BINARY + 1 @@ -755,7 +755,7 @@ TEST_F(RPCLedgerDataHandlerTest, JsonLimitMoreThanMax) auto const handler = AnyHandler{LedgerDataHandler{backend_}}; auto const req = json::parse(fmt::format( R"JSON({{ - "limit":{}, + "limit": {}, "binary": false }})JSON", LedgerDataHandler::kLIMIT_JSON + 1 @@ -789,8 +789,8 @@ TEST_F(RPCLedgerDataHandlerTest, TypeFilterMPTIssuance) runSpawn([&, this](auto yield) { auto const handler = AnyHandler{LedgerDataHandler{backend_}}; auto const req = json::parse(R"JSON({ - "limit":1, - "type":"mpt_issuance" + "limit": 1, + "type": "mpt_issuance" })JSON"); auto output = handler.process(req, Context{yield}); @@ -831,8 +831,8 @@ TEST_F(RPCLedgerDataHandlerTest, TypeFilterMPToken) runSpawn([&, this](auto yield) { auto const handler = AnyHandler{LedgerDataHandler{backend_}}; auto const req = json::parse(R"JSON({ - "limit":1, - "type":"mptoken" + "limit": 1, + "type": "mptoken" })JSON"); auto output = handler.process(req, Context{yield}); diff --git a/tests/unit/rpc/handlers/LedgerEntryTests.cpp b/tests/unit/rpc/handlers/LedgerEntryTests.cpp index 3067b476..7fc33d2a 100644 --- a/tests/unit/rpc/handlers/LedgerEntryTests.cpp +++ b/tests/unit/rpc/handlers/LedgerEntryTests.cpp @@ -687,7 +687,7 @@ generateTestValuesForParametersTest() .testJson = fmt::format( R"JSON({{ "ripple_state": {{ - "accounts" : ["{}"] + "accounts": ["{}"] }} }})JSON", kACCOUNT @@ -701,7 +701,7 @@ generateTestValuesForParametersTest() .testJson = fmt::format( R"JSON({{ "ripple_state": {{ - "accounts" : ["{}","{}"], + "accounts": ["{}", "{}"], "currency": "USD" }} }})JSON", @@ -717,7 +717,7 @@ generateTestValuesForParametersTest() .testJson = fmt::format( R"JSON({{ "ripple_state": {{ - "accounts" : ["{}",123], + "accounts": ["{}",123], "currency": "USD" }} }})JSON", @@ -732,7 +732,7 @@ generateTestValuesForParametersTest() .testJson = fmt::format( R"JSON({{ "ripple_state": {{ - "accounts" : ["{}","123"], + "accounts": ["{}", "123"], "currency": "USD" }} }})JSON", @@ -747,7 +747,7 @@ generateTestValuesForParametersTest() .testJson = fmt::format( R"JSON({{ "ripple_state": {{ - "accounts" : ["{}","{}"], + "accounts": ["{}", "{}"], "currency": "XXXX" }} }})JSON", @@ -763,7 +763,7 @@ generateTestValuesForParametersTest() .testJson = fmt::format( R"JSON({{ "ripple_state": {{ - "accounts" : ["{}","{}"], + "accounts": ["{}", "{}"], "currency": 123 }} }})JSON", @@ -912,11 +912,11 @@ generateTestValuesForParametersTest() R"JSON({{ "amm": {{ - "asset":{{}}, + "asset": {{}}, "asset2": {{ - "currency" : "USD", - "issuer" : "{}" + "currency": "USD", + "issuer": "{}" }} }} }})JSON", @@ -932,11 +932,11 @@ generateTestValuesForParametersTest() R"JSON({{ "amm": {{ - "asset2":{{}}, + "asset2": {{}}, "asset": {{ - "currency" : "USD", - "issuer" : "{}" + "currency": "USD", + "issuer": "{}" }} }} }})JSON", @@ -954,8 +954,8 @@ generateTestValuesForParametersTest() {{ "asset": {{ - "currency" : "USD", - "issuer" : "{}" + "currency": "USD", + "issuer": "{}" }} }} }})JSON", @@ -973,8 +973,8 @@ generateTestValuesForParametersTest() {{ "asset2": {{ - "currency" : "USD", - "issuer" : "{}" + "currency": "USD", + "issuer": "{}" }} }} }})JSON", @@ -993,8 +993,8 @@ generateTestValuesForParametersTest() "asset": "invalid", "asset2": {{ - "currency" : "USD", - "issuer" : "{}" + "currency": "USD", + "issuer": "{}" }} }} }})JSON", @@ -1013,8 +1013,8 @@ generateTestValuesForParametersTest() "asset2": "invalid", "asset": {{ - "currency" : "USD", - "issuer" : "{}" + "currency": "USD", + "issuer": "{}" }} }} }})JSON", @@ -1032,12 +1032,12 @@ generateTestValuesForParametersTest() {{ "asset2": {{ - "currency":"XRP" + "currency": "XRP" }}, "asset": {{ - "currency" : "USD2", - "issuer" : "{}" + "currency": "USD2", + "issuer": "{}" }} }} }})JSON", @@ -1055,12 +1055,12 @@ generateTestValuesForParametersTest() {{ "asset2": {{ - "currency":"XRP" + "currency": "XRP" }}, "asset": {{ - "currency" : "USD", - "issuer" : "aa{}" + "currency": "USD", + "issuer": "aa{}" }} }} }})JSON", @@ -1078,12 +1078,12 @@ generateTestValuesForParametersTest() {{ "asset2": {{ - "currency":"JPY" + "currency": "JPY" }}, "asset": {{ - "currency" : "USD", - "issuer" : "{}" + "currency": "USD", + "issuer": "{}" }} }} }})JSON", @@ -1101,13 +1101,13 @@ generateTestValuesForParametersTest() {{ "asset2": {{ - "currency":"XRP", - "issuer":"{}" + "currency": "XRP", + "issuer": "{}" }}, "asset": {{ - "currency" : "USD", - "issuer" : "{}" + "currency": "USD", + "issuer": "{}" }} }} }})JSON", @@ -1126,11 +1126,11 @@ generateTestValuesForParametersTest() {{ "asset2": {{ - "currency":"XRP" + "currency": "XRP" }}, "asset": {{ - "issuer" : "{}" + "issuer": "{}" }} }} }})JSON", @@ -2694,7 +2694,7 @@ generateTestValuesForNormalPathTest() R"JSON({{ "binary": true, "ripple_state": {{ - "accounts": ["{}","{}"], + "accounts": ["{}", "{}"], "currency": "USD" }} }})JSON", @@ -2782,11 +2782,11 @@ generateTestValuesForNormalPathTest() "LockingChainDoor": "{}", "IssuingChainDoor": "{}", "LockingChainIssue": {{ - "currency" : "XRP" + "currency": "XRP" }}, "IssuingChainIssue": {{ - "currency" : "JPY", - "issuer" : "{}" + "currency": "JPY", + "issuer": "{}" }} }} }})JSON", @@ -2817,11 +2817,11 @@ generateTestValuesForNormalPathTest() "LockingChainDoor": "{}", "IssuingChainDoor": "{}", "LockingChainIssue": {{ - "currency" : "XRP" + "currency": "XRP" }}, "IssuingChainIssue": {{ - "currency" : "JPY", - "issuer" : "{}" + "currency": "JPY", + "issuer": "{}" }} }} }})JSON", @@ -2851,11 +2851,11 @@ generateTestValuesForNormalPathTest() "LockingChainDoor": "{}", "IssuingChainDoor": "{}", "LockingChainIssue": {{ - "currency" : "XRP" + "currency": "XRP" }}, "IssuingChainIssue": {{ - "currency" : "JPY", - "issuer" : "{}" + "currency": "JPY", + "issuer": "{}" }}, "xchain_owned_claim_id": 10 }} @@ -2885,11 +2885,11 @@ generateTestValuesForNormalPathTest() "LockingChainDoor": "{}", "IssuingChainDoor": "{}", "LockingChainIssue": {{ - "currency" : "XRP" + "currency": "XRP" }}, "IssuingChainIssue": {{ - "currency" : "JPY", - "issuer" : "{}" + "currency": "JPY", + "issuer": "{}" }}, "xchain_owned_create_account_claim_id": 10 }} @@ -3131,23 +3131,23 @@ TEST_P(RPCLedgerEntryNormalPathTest, NormalPath) TEST_F(RPCLedgerEntryTest, BinaryFalse) { static constexpr auto kOUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "index":"05FB0EB4B899F056FA095537C5817163801F544BAFCEA39C995D76DB4D16F9DD", - "node":{ - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Amount":"100", - "Balance":"200", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Flags":0, - "LedgerEntryType":"PayChannel", - "OwnerNode":"0", - "PreviousTxnID":"05FB0EB4B899F056FA095537C5817163801F544BAFCEA39C995D76DB4D16F9DD", - "PreviousTxnLgrSeq":400, - "PublicKey":"020000000000000000000000000000000000000000000000000000000000000000", - "SettleDelay":300, - "index":"05FB0EB4B899F056FA095537C5817163801F544BAFCEA39C995D76DB4D16F9DD" + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "index": "05FB0EB4B899F056FA095537C5817163801F544BAFCEA39C995D76DB4D16F9DD", + "node": { + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Amount": "100", + "Balance": "200", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Flags": 0, + "LedgerEntryType": "PayChannel", + "OwnerNode": "0", + "PreviousTxnID": "05FB0EB4B899F056FA095537C5817163801F544BAFCEA39C995D76DB4D16F9DD", + "PreviousTxnLgrSeq": 400, + "PublicKey": "020000000000000000000000000000000000000000000000000000000000000000", + "SettleDelay": 300, + "index": "05FB0EB4B899F056FA095537C5817163801F544BAFCEA39C995D76DB4D16F9DD" } })JSON"; @@ -3622,23 +3622,23 @@ TEST_F(RPCLedgerEntryTest, ObjectSeqNotExist) TEST_F(RPCLedgerEntryTest, SyntheticMPTIssuanceID) { static constexpr auto kOUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "index":"FD7E7EFAE2A20E75850D0E0590B205E2F74DC472281768CD6E03988069816336", - "node":{ - "Flags":0, - "Issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "LedgerEntryType":"MPTokenIssuance", - "MPTokenMetadata":"6D65746164617461", - "MaximumAmount":"0", - "OutstandingAmount":"0", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":2, - "index":"FD7E7EFAE2A20E75850D0E0590B205E2F74DC472281768CD6E03988069816336", - "mpt_issuance_id":"000000024B4E9C06F24296074F7BC48F92A97916C6DC5EA9" + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "index": "FD7E7EFAE2A20E75850D0E0590B205E2F74DC472281768CD6E03988069816336", + "node": { + "Flags": 0, + "Issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "LedgerEntryType": "MPTokenIssuance", + "MPTokenMetadata": "6D65746164617461", + "MaximumAmount": "0", + "OutstandingAmount": "0", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 2, + "index": "FD7E7EFAE2A20E75850D0E0590B205E2F74DC472281768CD6E03988069816336", + "mpt_issuance_id": "000000024B4E9C06F24296074F7BC48F92A97916C6DC5EA9" } })JSON"; diff --git a/tests/unit/rpc/handlers/LedgerTests.cpp b/tests/unit/rpc/handlers/LedgerTests.cpp index ff554a6e..d203fd93 100644 --- a/tests/unit/rpc/handlers/LedgerTests.cpp +++ b/tests/unit/rpc/handlers/LedgerTests.cpp @@ -264,22 +264,22 @@ TEST_F(RPCLedgerHandlerTest, Default) { static constexpr auto kEXPECTED_OUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "ledger":{ - "account_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "close_flags":0, - "close_time":0, - "close_time_resolution":0, - "closed":true, - "close_time_iso":"2000-01-01T00:00:00Z", - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":"30", - "parent_close_time":0, - "parent_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "total_coins":"0", - "transaction_hash":"0000000000000000000000000000000000000000000000000000000000000000" + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "ledger": { + "account_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "close_flags": 0, + "close_time": 0, + "close_time_resolution": 0, + "closed": true, + "close_time_iso": "2000-01-01T00:00:00Z", + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": "30", + "parent_close_time": 0, + "parent_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "total_coins": "0", + "transaction_hash": "0000000000000000000000000000000000000000000000000000000000000000" } })JSON"; @@ -352,12 +352,12 @@ TEST_F(RPCLedgerHandlerTest, BinaryTrue) { static constexpr auto kEXPECTED_OUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "ledger":{ - "ledger_data":"0000001E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "closed":true + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "ledger": { + "ledger_data": "0000001E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "closed": true } })JSON"; @@ -382,20 +382,20 @@ TEST_F(RPCLedgerHandlerTest, TransactionsExpandBinary) { static constexpr auto kEXPECTED_OUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "ledger":{ - "ledger_data":"0000001E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "closed":true, - "transactions":[ + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "ledger": { + "ledger_data": "0000001E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "closed": true, + "transactions": [ { - "tx_blob":"120000240000001E61400000000000006468400000000000000373047465737481144B4E9C06F24296074F7BC48F92A97916C6DC5EA98314D31252CF902EF8DD8451243869B38667CBD89DF3", - "meta":"201C00000000F8E5110061E762400000000000006E81144B4E9C06F24296074F7BC48F92A97916C6DC5EA9E1E1E5110061E762400000000000001E8114D31252CF902EF8DD8451243869B38667CBD89DF3E1E1F1031000" + "tx_blob": "120000240000001E61400000000000006468400000000000000373047465737481144B4E9C06F24296074F7BC48F92A97916C6DC5EA98314D31252CF902EF8DD8451243869B38667CBD89DF3", + "meta": "201C00000000F8E5110061E762400000000000006E81144B4E9C06F24296074F7BC48F92A97916C6DC5EA9E1E1E5110061E762400000000000001E8114D31252CF902EF8DD8451243869B38667CBD89DF3E1E1F1031000" }, { - "tx_blob":"120000240000001E61400000000000006468400000000000000373047465737481144B4E9C06F24296074F7BC48F92A97916C6DC5EA98314D31252CF902EF8DD8451243869B38667CBD89DF3", - "meta":"201C00000000F8E5110061E762400000000000006E81144B4E9C06F24296074F7BC48F92A97916C6DC5EA9E1E1E5110061E762400000000000001E8114D31252CF902EF8DD8451243869B38667CBD89DF3E1E1F1031000" + "tx_blob": "120000240000001E61400000000000006468400000000000000373047465737481144B4E9C06F24296074F7BC48F92A97916C6DC5EA98314D31252CF902EF8DD8451243869B38667CBD89DF3", + "meta": "201C00000000F8E5110061E762400000000000006E81144B4E9C06F24296074F7BC48F92A97916C6DC5EA9E1E1E5110061E762400000000000001E8114D31252CF902EF8DD8451243869B38667CBD89DF3E1E1F1031000" } ] } @@ -435,7 +435,7 @@ TEST_F(RPCLedgerHandlerTest, TransactionsExpandBinaryV2) "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", "ledger_index": 30, "validated": true, - "ledger":{ + "ledger": { "ledger_data": "0000001E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "closed": true, "transactions": [ @@ -482,57 +482,57 @@ TEST_F(RPCLedgerHandlerTest, TransactionsExpandNotBinary) { static constexpr auto kEXPECTED_OUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "ledger":{ - "account_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "close_flags":0, - "close_time":0, - "close_time_resolution":0, - "closed":true, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":"30", - "parent_close_time":0, - "close_time_iso":"2000-01-01T00:00:00Z", - "parent_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "total_coins":"0", - "transaction_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "transactions":[ + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "ledger": { + "account_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "close_flags": 0, + "close_time": 0, + "close_time_resolution": 0, + "closed": true, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": "30", + "parent_close_time": 0, + "close_time_iso": "2000-01-01T00:00:00Z", + "parent_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "total_coins": "0", + "transaction_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "transactions": [ { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Amount":"100", - "DeliverMax":"100", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"3", - "Sequence":30, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "hash":"70436A9332F7CD928FAEC1A41269A677739D8B11F108CE23AE23CBF0C9113F8C", - "metaData":{ - "AffectedNodes":[ + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Amount": "100", + "DeliverMax": "100", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "3", + "Sequence": 30, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "hash": "70436A9332F7CD928FAEC1A41269A677739D8B11F108CE23AE23CBF0C9113F8C", + "metaData": { + "AffectedNodes": [ { - "ModifiedNode":{ - "FinalFields":{ - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Balance":"110" + "ModifiedNode": { + "FinalFields": { + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Balance": "110" }, - "LedgerEntryType":"AccountRoot" + "LedgerEntryType": "AccountRoot" } }, { - "ModifiedNode":{ - "FinalFields":{ - "Account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Balance":"30" + "ModifiedNode": { + "FinalFields": { + "Account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Balance": "30" }, - "LedgerEntryType":"AccountRoot" + "LedgerEntryType": "AccountRoot" } } ], - "TransactionIndex":0, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 0, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" } } ] @@ -575,7 +575,7 @@ TEST_F(RPCLedgerHandlerTest, TransactionsExpandNotBinaryV2) "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", "ledger_index": 30, "validated": true, - "ledger":{ + "ledger": { "account_hash": "0000000000000000000000000000000000000000000000000000000000000000", "close_flags": 0, "close_time": 0, @@ -588,7 +588,7 @@ TEST_F(RPCLedgerHandlerTest, TransactionsExpandNotBinaryV2) "parent_hash": "0000000000000000000000000000000000000000000000000000000000000000", "total_coins": "0", "transaction_hash": "0000000000000000000000000000000000000000000000000000000000000000", - "transactions":[ + "transactions": [ { "validated": true, "close_time_iso": "2000-01-01T00:00:00Z", @@ -605,8 +605,8 @@ TEST_F(RPCLedgerHandlerTest, TransactionsExpandNotBinaryV2) "SigningPubKey": "74657374", "TransactionType": "Payment" }, - "meta":{ - "AffectedNodes":[ + "meta": { + "AffectedNodes": [ { "ModifiedNode": { @@ -733,7 +733,7 @@ TEST_F(RPCLedgerHandlerTest, TransactionsNotExpand) ASSERT_TRUE(output); EXPECT_EQ( output.result->as_object().at("ledger").at("transactions"), - json::parse(fmt::format(R"JSON(["{}","{}"])JSON", kINDEX1, kINDEX2)) + json::parse(fmt::format(R"JSON(["{}", "{}"])JSON", kINDEX1, kINDEX2)) ); }); } @@ -743,22 +743,22 @@ TEST_F(RPCLedgerHandlerTest, DiffNotBinary) static constexpr auto kEXPECTED_OUT = R"JSON([ { - "object_id":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515B1", - "object":"" + "object_id": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515B1", + "object": "" }, { - "object_id":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "object":{ - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Balance":"10", - "Flags":4194304, - "LedgerEntryType":"AccountRoot", - "OwnerCount":2, - "PreviousTxnID":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "PreviousTxnLgrSeq":3, - "Sequence":1, - "TransferRate":0, - "index":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" + "object_id": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "object": { + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Balance": "10", + "Flags": 4194304, + "LedgerEntryType": "AccountRoot", + "OwnerCount": 2, + "PreviousTxnID": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "PreviousTxnLgrSeq": 3, + "Sequence": 1, + "TransferRate": 0, + "index": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC" } } ])JSON"; @@ -798,12 +798,12 @@ TEST_F(RPCLedgerHandlerTest, DiffBinary) static constexpr auto kEXPECTED_OUT = R"JSON([ { - "object_id":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515B1", - "object":"" + "object_id": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515B1", + "object": "" }, { - "object_id":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "object":"1100612200400000240000000125000000032B000000002D00000002551B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC62400000000000000A81144B4E9C06F24296074F7BC48F92A97916C6DC5EA9" + "object_id": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "object": "1100612200400000240000000125000000032B000000002D00000002551B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC62400000000000000A81144B4E9C06F24296074F7BC48F92A97916C6DC5EA9" } ])JSON"; @@ -842,57 +842,57 @@ TEST_F(RPCLedgerHandlerTest, OwnerFundsEmpty) { static constexpr auto kEXPECTED_OUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "validated":true, - "ledger":{ - "account_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "close_flags":0, - "close_time":0, - "close_time_resolution":0, - "closed":true, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":"30", - "parent_close_time":0, - "close_time_iso":"2000-01-01T00:00:00Z", - "parent_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "total_coins":"0", - "transaction_hash":"0000000000000000000000000000000000000000000000000000000000000000", - "transactions":[ + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "validated": true, + "ledger": { + "account_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "close_flags": 0, + "close_time": 0, + "close_time_resolution": 0, + "closed": true, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": "30", + "parent_close_time": 0, + "close_time_iso": "2000-01-01T00:00:00Z", + "parent_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "total_coins": "0", + "transaction_hash": "0000000000000000000000000000000000000000000000000000000000000000", + "transactions": [ { - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Amount":"100", - "DeliverMax":"100", - "Destination":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Fee":"3", - "Sequence":30, - "SigningPubKey":"74657374", - "TransactionType":"Payment", - "hash":"70436A9332F7CD928FAEC1A41269A677739D8B11F108CE23AE23CBF0C9113F8C", - "metaData":{ - "AffectedNodes":[ + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Amount": "100", + "DeliverMax": "100", + "Destination": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Fee": "3", + "Sequence": 30, + "SigningPubKey": "74657374", + "TransactionType": "Payment", + "hash": "70436A9332F7CD928FAEC1A41269A677739D8B11F108CE23AE23CBF0C9113F8C", + "metaData": { + "AffectedNodes": [ { - "ModifiedNode":{ - "FinalFields":{ - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Balance":"110" + "ModifiedNode": { + "FinalFields": { + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Balance": "110" }, - "LedgerEntryType":"AccountRoot" + "LedgerEntryType": "AccountRoot" } }, { - "ModifiedNode":{ - "FinalFields":{ - "Account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "Balance":"30" + "ModifiedNode": { + "FinalFields": { + "Account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "Balance": "30" }, - "LedgerEntryType":"AccountRoot" + "LedgerEntryType": "AccountRoot" } } ], - "TransactionIndex":0, - "TransactionResult":"tesSUCCESS", - "delivered_amount":"unavailable" + "TransactionIndex": 0, + "TransactionResult": "tesSUCCESS", + "delivered_amount": "unavailable" } } ] diff --git a/tests/unit/rpc/handlers/MPTHoldersTests.cpp b/tests/unit/rpc/handlers/MPTHoldersTests.cpp index 2f2421c7..69046578 100644 --- a/tests/unit/rpc/handlers/MPTHoldersTests.cpp +++ b/tests/unit/rpc/handlers/MPTHoldersTests.cpp @@ -376,7 +376,7 @@ TEST_F(RPCMPTHoldersHandlerTest, DefaultParameters) auto const currentOutput = fmt::format( R"JSON({{ "mpt_issuance_id": "{}", - "limit":50, + "limit": 50, "ledger_index": 30, "mptokens": [{}], "validated": true @@ -420,7 +420,7 @@ TEST_F(RPCMPTHoldersHandlerTest, CustomAmounts) auto const currentOutput = fmt::format( R"JSON({{ "mpt_issuance_id": "{}", - "limit":50, + "limit": 50, "ledger_index": 30, "mptokens": [{{ "account": "rrnAZCqMahreZrKMcZU3t2DZ6yUndT4ubN", @@ -467,7 +467,7 @@ TEST_F(RPCMPTHoldersHandlerTest, SpecificLedgerIndex) auto const currentOutput = fmt::format( R"JSON({{ "mpt_issuance_id": "{}", - "limit":50, + "limit": 50, "ledger_index": {}, "mptokens": [{}], "validated": true @@ -516,7 +516,7 @@ TEST_F(RPCMPTHoldersHandlerTest, MarkerParameter) auto const currentOutput = fmt::format( R"JSON({{ "mpt_issuance_id": "{}", - "limit":50, + "limit": 50, "ledger_index": 30, "mptokens": [{}], "validated": true, @@ -563,7 +563,7 @@ TEST_F(RPCMPTHoldersHandlerTest, MultipleMPTs) auto const currentOutput = fmt::format( R"JSON({{ "mpt_issuance_id": "{}", - "limit":50, + "limit": 50, "ledger_index": 30, "mptokens": [{}, {}], "validated": true @@ -607,7 +607,7 @@ TEST_F(RPCMPTHoldersHandlerTest, LimitMoreThanMAx) auto const currentOutput = fmt::format( R"JSON({{ "mpt_issuance_id": "{}", - "limit":100, + "limit": 100, "ledger_index": 30, "mptokens": [{}], "validated": true diff --git a/tests/unit/rpc/handlers/NFTHistoryTests.cpp b/tests/unit/rpc/handlers/NFTHistoryTests.cpp index 6551b49b..b8d44248 100644 --- a/tests/unit/rpc/handlers/NFTHistoryTests.cpp +++ b/tests/unit/rpc/handlers/NFTHistoryTests.cpp @@ -85,84 +85,84 @@ generateTestValuesForParametersTest() NFTHistoryParamTestCaseBundle{ .testName = "BinaryNotBool", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "binary": 1})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "binary": 1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, NFTHistoryParamTestCaseBundle{ .testName = "ForwardNotBool", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "forward": 1})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "forward": 1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, NFTHistoryParamTestCaseBundle{ .testName = "ledger_index_minNotInt", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index_min": "x"})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index_min": "x"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, NFTHistoryParamTestCaseBundle{ .testName = "ledger_index_maxNotInt", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index_max": "x"})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index_max": "x"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, NFTHistoryParamTestCaseBundle{ .testName = "ledger_indexInvalid", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index": "x"})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index": "x"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "ledgerIndexMalformed" }, NFTHistoryParamTestCaseBundle{ .testName = "ledger_hashInvalid", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_hash": "x"})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_hash": "x"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "ledger_hashMalformed" }, NFTHistoryParamTestCaseBundle{ .testName = "ledger_hashNotString", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_hash": 123})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_hash": 123})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "ledger_hashNotString" }, NFTHistoryParamTestCaseBundle{ .testName = "limitNotInt", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "limit": "123"})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "limit": "123"})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, NFTHistoryParamTestCaseBundle{ .testName = "limitNegative", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "limit": -1})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "limit": -1})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, NFTHistoryParamTestCaseBundle{ .testName = "limitZero", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "limit": 0})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "limit": 0})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Invalid parameters." }, NFTHistoryParamTestCaseBundle{ .testName = "MarkerNotObject", .testJson = - R"JSON({"nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "marker": 101})JSON", + R"JSON({"nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "marker": 101})JSON", .expectedError = "invalidParams", .expectedErrorMessage = "invalidMarker" }, NFTHistoryParamTestCaseBundle{ .testName = "MarkerMissingSeq", .testJson = R"JSON({ - "nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", + "nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "marker": {"ledger": 123} })JSON", .expectedError = "invalidParams", @@ -171,8 +171,8 @@ generateTestValuesForParametersTest() NFTHistoryParamTestCaseBundle{ .testName = "MarkerMissingLedger", .testJson = R"JSON({ - "nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", - "marker":{"seq": 123} + "nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", + "marker": {"seq": 123} })JSON", .expectedError = "invalidParams", .expectedErrorMessage = "Required field 'ledger' missing" @@ -180,7 +180,7 @@ generateTestValuesForParametersTest() NFTHistoryParamTestCaseBundle{ .testName = "MarkerLedgerNotInt", .testJson = R"JSON({ - "nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", + "nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "marker": { "seq": "string", @@ -193,7 +193,7 @@ generateTestValuesForParametersTest() NFTHistoryParamTestCaseBundle{ .testName = "MarkerSeqNotInt", .testJson = R"JSON({ - "nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", + "nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "marker": { "ledger": "string", @@ -206,7 +206,7 @@ generateTestValuesForParametersTest() NFTHistoryParamTestCaseBundle{ .testName = "LedgerIndexMinLessThanMinSeq", .testJson = R"JSON({ - "nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", + "nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index_min": 9 })JSON", .expectedError = "lgrIdxMalformed", @@ -215,7 +215,7 @@ generateTestValuesForParametersTest() NFTHistoryParamTestCaseBundle{ .testName = "LedgerIndexMaxLargeThanMaxSeq", .testJson = R"JSON({ - "nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", + "nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index_max": 31 })JSON", .expectedError = "lgrIdxMalformed", @@ -224,7 +224,7 @@ generateTestValuesForParametersTest() NFTHistoryParamTestCaseBundle{ .testName = "LedgerIndexMaxLessThanLedgerIndexMin", .testJson = R"JSON({ - "nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", + "nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index_max": 11, "ledger_index_min": 20 })JSON", @@ -234,7 +234,7 @@ generateTestValuesForParametersTest() NFTHistoryParamTestCaseBundle{ .testName = "LedgerIndexMaxMinAndLedgerIndex", .testJson = R"JSON({ - "nft_id":"00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", + "nft_id": "00010000A7CAD27B688D14BA1A9FA5366554D6ADCF9CE0875B974D9F00000004", "ledger_index_max": 20, "ledger_index_min": 11, "ledger_index": 10 @@ -312,7 +312,7 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexSpecificForwardTrue) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "forward": true @@ -326,7 +326,7 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexSpecificForwardTrue) EXPECT_EQ(output.result->at("nft_id").as_string(), kNFT_ID); EXPECT_EQ(output.result->at("ledger_index_min").as_uint64(), kMIN_SEQ + 1); EXPECT_EQ(output.result->at("ledger_index_max").as_uint64(), kMAX_SEQ - 1); - EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger":12,"seq":34})JSON")); + EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger": 12, "seq": 34})JSON")); EXPECT_EQ(output.result->at("transactions").as_array().size(), 2); EXPECT_FALSE(output.result->as_object().contains("limit")); }); @@ -346,8 +346,8 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexSpecificForwardFalseV1) "AffectedNodes": [ { - "ModifiedNode":{ - "FinalFields":{ + "ModifiedNode": { + "FinalFields": { "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "Balance": "22" }, @@ -355,8 +355,8 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexSpecificForwardFalseV1) } }, { - "ModifiedNode":{ - "FinalFields":{ + "ModifiedNode": { + "FinalFields": { "Account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "Balance": "23" }, @@ -390,8 +390,8 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexSpecificForwardFalseV1) "AffectedNodes": [ { - "ModifiedNode":{ - "FinalFields":{ + "ModifiedNode": { + "FinalFields": { "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "Balance": "22" }, @@ -399,8 +399,8 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexSpecificForwardFalseV1) } }, { - "ModifiedNode":{ - "FinalFields":{ + "ModifiedNode": { + "FinalFields": { "Account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "Balance": "23" }, @@ -456,7 +456,7 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexSpecificForwardFalseV1) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "forward": false @@ -610,7 +610,7 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexSpecificForwardFalseV2) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "forward": false @@ -642,7 +642,7 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexNotSpecificForwardTrue) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "forward": true @@ -656,7 +656,7 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexNotSpecificForwardTrue) EXPECT_EQ(output.result->at("nft_id").as_string(), kNFT_ID); EXPECT_EQ(output.result->at("ledger_index_min").as_uint64(), kMIN_SEQ); EXPECT_EQ(output.result->at("ledger_index_max").as_uint64(), kMAX_SEQ); - EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger":12,"seq":34})JSON")); + EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger": 12, "seq": 34})JSON")); EXPECT_EQ(output.result->at("transactions").as_array().size(), 2); EXPECT_FALSE(output.result->as_object().contains("limit")); }); @@ -683,7 +683,7 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexNotSpecificForwardFalse) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "forward": false @@ -697,7 +697,7 @@ TEST_F(RPCNFTHistoryHandlerTest, IndexNotSpecificForwardFalse) EXPECT_EQ(output.result->at("nft_id").as_string(), kNFT_ID); EXPECT_EQ(output.result->at("ledger_index_min").as_uint64(), kMIN_SEQ); EXPECT_EQ(output.result->at("ledger_index_max").as_uint64(), kMAX_SEQ); - EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger":12,"seq":34})JSON")); + EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger": 12, "seq": 34})JSON")); EXPECT_EQ(output.result->at("transactions").as_array().size(), 2); EXPECT_FALSE(output.result->as_object().contains("limit")); }); @@ -724,7 +724,7 @@ TEST_F(RPCNFTHistoryHandlerTest, BinaryTrueV1) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "binary": true @@ -738,7 +738,7 @@ TEST_F(RPCNFTHistoryHandlerTest, BinaryTrueV1) EXPECT_EQ(output.result->at("nft_id").as_string(), kNFT_ID); EXPECT_EQ(output.result->at("ledger_index_min").as_uint64(), kMIN_SEQ); EXPECT_EQ(output.result->at("ledger_index_max").as_uint64(), kMAX_SEQ); - EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger":12,"seq":34})JSON")); + EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger": 12, "seq": 34})JSON")); EXPECT_EQ(output.result->at("transactions").as_array().size(), 2); EXPECT_EQ( output.result->at("transactions").as_array()[0].as_object().at("meta").as_string(), @@ -778,7 +778,7 @@ TEST_F(RPCNFTHistoryHandlerTest, BinaryTrueV2) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "binary": true @@ -792,7 +792,7 @@ TEST_F(RPCNFTHistoryHandlerTest, BinaryTrueV2) EXPECT_EQ(output.result->at("nft_id").as_string(), kNFT_ID); EXPECT_EQ(output.result->at("ledger_index_min").as_uint64(), kMIN_SEQ); EXPECT_EQ(output.result->at("ledger_index_max").as_uint64(), kMAX_SEQ); - EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger":12,"seq":34})JSON")); + EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger": 12, "seq": 34})JSON")); EXPECT_EQ(output.result->at("transactions").as_array().size(), 2); EXPECT_EQ( output.result->at("transactions").as_array()[0].as_object().at("meta_blob").as_string(), @@ -829,12 +829,12 @@ TEST_F(RPCNFTHistoryHandlerTest, LimitAndMarker) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "limit": 2, "forward": false, - "marker": {{"ledger":10,"seq":11}} + "marker": {{"ledger": 10, "seq": 11}} }})JSON", kNFT_ID, -1, @@ -846,7 +846,7 @@ TEST_F(RPCNFTHistoryHandlerTest, LimitAndMarker) EXPECT_EQ(output.result->at("ledger_index_min").as_uint64(), kMIN_SEQ); EXPECT_EQ(output.result->at("ledger_index_max").as_uint64(), kMAX_SEQ); EXPECT_EQ(output.result->at("limit").as_uint64(), 2); - EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger":12,"seq":34})JSON")); + EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger": 12, "seq": 34})JSON")); EXPECT_EQ(output.result->at("transactions").as_array().size(), 2); }); } @@ -877,8 +877,8 @@ TEST_F(RPCNFTHistoryHandlerTest, SpecificLedgerIndex) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", - "ledger_index":{} + "nft_id": "{}", + "ledger_index": {} }})JSON", kNFT_ID, kMAX_SEQ - 1 @@ -903,8 +903,8 @@ TEST_F(RPCNFTHistoryHandlerTest, SpecificNonexistLedgerIntIndex) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", - "ledger_index":{} + "nft_id": "{}", + "ledger_index": {} }})JSON", kNFT_ID, kMAX_SEQ - 1 @@ -926,8 +926,8 @@ TEST_F(RPCNFTHistoryHandlerTest, SpecificNonexistLedgerStringIndex) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", - "ledger_index":"{}" + "nft_id": "{}", + "ledger_index": "{}" }})JSON", kNFT_ID, kMAX_SEQ - 1 @@ -966,8 +966,8 @@ TEST_F(RPCNFTHistoryHandlerTest, SpecificLedgerHash) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", - "ledger_hash":"{}" + "nft_id": "{}", + "ledger_hash": "{}" }})JSON", kNFT_ID, kLEDGER_HASH @@ -1004,7 +1004,7 @@ TEST_F(RPCNFTHistoryHandlerTest, TxLessThanMinSeq) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "forward": false @@ -1045,7 +1045,7 @@ TEST_F(RPCNFTHistoryHandlerTest, TxLargerThanMaxSeq) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "forward": false @@ -1061,7 +1061,7 @@ TEST_F(RPCNFTHistoryHandlerTest, TxLargerThanMaxSeq) EXPECT_EQ(output.result->at("ledger_index_max").as_uint64(), kMAX_SEQ - 2); EXPECT_EQ(output.result->at("transactions").as_array().size(), 1); EXPECT_FALSE(output.result->as_object().contains("limit")); - EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger":12,"seq":34})JSON")); + EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger": 12, "seq": 34})JSON")); }); } @@ -1086,7 +1086,7 @@ TEST_F(RPCNFTHistoryHandlerTest, LimitMoreThanMax) auto const handler = AnyHandler{NFTHistoryHandler{backend_}}; static auto const kINPUT = json::parse(fmt::format( R"JSON({{ - "nft_id":"{}", + "nft_id": "{}", "ledger_index_min": {}, "ledger_index_max": {}, "forward": false, @@ -1102,7 +1102,7 @@ TEST_F(RPCNFTHistoryHandlerTest, LimitMoreThanMax) EXPECT_EQ(output.result->at("nft_id").as_string(), kNFT_ID); EXPECT_EQ(output.result->at("ledger_index_min").as_uint64(), kMIN_SEQ + 1); EXPECT_EQ(output.result->at("ledger_index_max").as_uint64(), kMAX_SEQ - 1); - EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger":12,"seq":34})JSON")); + EXPECT_EQ(output.result->at("marker").as_object(), json::parse(R"JSON({"ledger": 12, "seq": 34})JSON")); EXPECT_EQ(output.result->at("transactions").as_array().size(), 2); EXPECT_EQ(output.result->as_object().at("limit").as_uint64(), NFTHistoryHandler::kLIMIT_MAX); }); diff --git a/tests/unit/rpc/handlers/NFTsByIssuerTest.cpp b/tests/unit/rpc/handlers/NFTsByIssuerTest.cpp index 04298598..4b4f6bff 100644 --- a/tests/unit/rpc/handlers/NFTsByIssuerTest.cpp +++ b/tests/unit/rpc/handlers/NFTsByIssuerTest.cpp @@ -535,7 +535,7 @@ TEST_F(RPCNFTsByIssuerHandlerTest, MultipleNFTs) auto const currentOutput = fmt::format( R"JSON({{ "issuer": "{}", - "limit":50, + "limit": 50, "ledger_index": 30, "nfts": [{}, {}, {}], "validated": true diff --git a/tests/unit/rpc/handlers/NoRippleCheckTests.cpp b/tests/unit/rpc/handlers/NoRippleCheckTests.cpp index 0793b8af..cb7122de 100644 --- a/tests/unit/rpc/handlers/NoRippleCheckTests.cpp +++ b/tests/unit/rpc/handlers/NoRippleCheckTests.cpp @@ -318,13 +318,13 @@ TEST_F(RPCNoRippleCheckTest, NormalPathRoleUserDefaultRippleSetTrustLineNoRipple static constexpr auto kSEQ = 30; static constexpr auto kEXPECTED_OUTPUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, "problems": [ "You appear to have set your default ripple flag even though you are not a gateway. This is not recommended unless you are experimenting" ], - "validated":true + "validated": true })JSON"; auto ledgerHeader = createLedgerHeader(kLEDGER_HASH, kSEQ); @@ -379,13 +379,13 @@ TEST_F(RPCNoRippleCheckTest, NormalPathRoleUserDefaultRippleUnsetTrustLineNoRipp static constexpr auto kSEQ = 30; static constexpr auto kEXPECTED_OUTPUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "problems":[ + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "problems": [ "You should probably set the no ripple flag on your USD line to rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "You should probably set the no ripple flag on your USD line to rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun" ], - "validated":true + "validated": true })JSON"; auto ledgerHeader = createLedgerHeader(kLEDGER_HASH, kSEQ); @@ -434,14 +434,14 @@ TEST_F(RPCNoRippleCheckTest, NormalPathRoleGatewayDefaultRippleSetTrustLineNoRip static constexpr auto kSEQ = 30; static constexpr auto kEXPECTED_OUTPUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, "problems": [ "You should clear the no ripple flag on your USD line to rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "You should clear the no ripple flag on your USD line to rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun" ], - "validated":true + "validated": true })JSON"; auto ledgerHeader = createLedgerHeader(kLEDGER_HASH, kSEQ); @@ -496,13 +496,13 @@ TEST_F(RPCNoRippleCheckTest, NormalPathRoleGatewayDefaultRippleUnsetTrustLineNoR static constexpr auto kSEQ = 30; static constexpr auto kEXPECTED_OUTPUT = R"JSON({ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, "problems": [ "You should immediately set your default ripple flag" ], - "validated":true + "validated": true })JSON"; auto ledgerHeader = createLedgerHeader(kLEDGER_HASH, kSEQ); @@ -653,47 +653,47 @@ TEST_F(RPCNoRippleCheckTest, NormalPathTransactions) constexpr auto kTRANSACTION_SEQ = 123; auto const expectedOutput = fmt::format( R"JSON({{ - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_index":30, - "problems":[ + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_index": 30, + "problems": [ "You should immediately set your default ripple flag", "You should clear the no ripple flag on your USD line to rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "You should clear the no ripple flag on your USD line to rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun" ], - "transactions":[ + "transactions": [ {{ - "Sequence":{}, - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Fee":1, - "TransactionType":"AccountSet", - "SetFlag":8 + "Sequence": {}, + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Fee": 1, + "TransactionType": "AccountSet", + "SetFlag": 8 }}, {{ - "Sequence":{}, - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Fee":1, - "TransactionType":"TrustSet", - "LimitAmount":{{ - "currency":"USD", - "issuer":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "value":"10" + "Sequence": {}, + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Fee": 1, + "TransactionType": "TrustSet", + "LimitAmount": {{ + "currency": "USD", + "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "value": "10" }}, - "Flags":{} + "Flags": {} }}, {{ - "Sequence":{}, - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Fee":1, - "TransactionType":"TrustSet", - "LimitAmount":{{ - "currency":"USD", - "issuer":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "value":"10" + "Sequence": {}, + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Fee": 1, + "TransactionType": "TrustSet", + "LimitAmount": {{ + "currency": "USD", + "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "value": "10" }}, - "Flags":{} + "Flags": {} }} ], - "validated":true + "validated": true }})JSON", kTRANSACTION_SEQ, kTRANSACTION_SEQ + 1, diff --git a/tests/unit/rpc/handlers/SubscribeTests.cpp b/tests/unit/rpc/handlers/SubscribeTests.cpp index 99fd36ac..79cfcdd2 100644 --- a/tests/unit/rpc/handlers/SubscribeTests.cpp +++ b/tests/unit/rpc/handlers/SubscribeTests.cpp @@ -631,7 +631,7 @@ TEST_F(RPCSubscribeHandlerTest, StreamsWithoutLedger) // these streams don't return response auto const input = json::parse( R"JSON({ - "streams": ["transactions_proposed","transactions","validations","manifests","book_changes"] + "streams": ["transactions_proposed", "transactions", "validations", "manifests", "book_changes"] })JSON" ); runSpawn([&, this](auto yield) { @@ -654,13 +654,13 @@ TEST_F(RPCSubscribeHandlerTest, StreamsLedger) { static constexpr auto kEXPECTED_OUTPUT = R"JSON({ - "validated_ledgers":"10-30", - "ledger_index":30, - "ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", - "ledger_time":0, - "fee_base":1, - "reserve_base":3, - "reserve_inc":2 + "validated_ledgers": "10-30", + "ledger_index": 30, + "ledger_hash": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652", + "ledger_time": 0, + "fee_base": 1, + "reserve_base": 3, + "reserve_inc": 2 })JSON"; auto const input = json::parse( @@ -686,7 +686,7 @@ TEST_F(RPCSubscribeHandlerTest, Accounts) { auto const input = json::parse(fmt::format( R"JSON({{ - "accounts": ["{}","{}","{}"] + "accounts": ["{}", "{}", "{}"] }})JSON", kACCOUNT, kACCOUNT2, @@ -709,7 +709,7 @@ TEST_F(RPCSubscribeHandlerTest, AccountsProposed) { auto const input = json::parse(fmt::format( R"JSON({{ - "accounts_proposed": ["{}","{}","{}"] + "accounts_proposed": ["{}", "{}", "{}"] }})JSON", kACCOUNT, kACCOUNT2, @@ -901,25 +901,25 @@ TEST_F(RPCSubscribeHandlerTest, BooksBothSnapshotSet) static auto const kEXPECTED_OFFER = fmt::format( R"JSON({{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerGets":"10", + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerGets": "10", "TakerPays": {{ - "currency":"USD", - "issuer":"{}", - "value":"20" + "currency": "USD", + "issuer": "{}", + "value": "20" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"193", - "quality":"2" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "193", + "quality": "2" }})JSON", kACCOUNT2, kPAYS20_USD_GETS10_XRP_BOOK_DIR, @@ -927,25 +927,25 @@ TEST_F(RPCSubscribeHandlerTest, BooksBothSnapshotSet) ); static auto const kEXPECTED_REVERSED_OFFER = fmt::format( R"JSON({{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, "TakerGets": {{ - "currency":"USD", - "issuer":"{}", - "value":"10" + "currency": "USD", + "issuer": "{}", + "value": "10" }}, - "TakerPays":"20", - "index":"1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", - "owner_funds":"10", - "quality":"2" + "TakerPays": "20", + "index": "1B8590C01B0006EDFA9ED60296DD052DC5E90F99659B25014D08E1BC983515BC", + "owner_funds": "10", + "quality": "2" }})JSON", kACCOUNT, kPAYS20_XRP_GETS10_USD_BOOK_DIR, @@ -1072,25 +1072,25 @@ TEST_F(RPCSubscribeHandlerTest, BooksBothUnsetSnapshotSet) static auto const kEXPECTED_OFFER = fmt::format( R"JSON({{ - "Account":"{}", - "BookDirectory":"{}", - "BookNode":"0", - "Flags":0, - "LedgerEntryType":"Offer", - "OwnerNode":"0", - "PreviousTxnID":"0000000000000000000000000000000000000000000000000000000000000000", - "PreviousTxnLgrSeq":0, - "Sequence":0, - "TakerGets":"10", + "Account": "{}", + "BookDirectory": "{}", + "BookNode": "0", + "Flags": 0, + "LedgerEntryType": "Offer", + "OwnerNode": "0", + "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000000", + "PreviousTxnLgrSeq": 0, + "Sequence": 0, + "TakerGets": "10", "TakerPays": {{ - "currency":"USD", - "issuer":"{}", - "value":"20" + "currency": "USD", + "issuer": "{}", + "value": "20" }}, - "index":"E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", - "owner_funds":"193", - "quality":"2" + "index": "E6DBAFC99223B42257915A63DFC6B0C032D4070F9A574B255AD97466726FC321", + "owner_funds": "193", + "quality": "2" }})JSON", kACCOUNT2, kPAYS20_USD_GETS10_XRP_BOOK_DIR, diff --git a/tests/unit/rpc/handlers/TransactionEntryTests.cpp b/tests/unit/rpc/handlers/TransactionEntryTests.cpp index 13403a79..2c59e02d 100644 --- a/tests/unit/rpc/handlers/TransactionEntryTests.cpp +++ b/tests/unit/rpc/handlers/TransactionEntryTests.cpp @@ -72,7 +72,7 @@ TEST_F(RPCTransactionEntryHandlerTest, TxHashWrongFormat) { runSpawn([this](auto yield) { auto const handler = AnyHandler{TransactionEntryHandler{backend_}}; - auto const output = handler.process(json::parse(R"JSON({"tx_hash":"123"})JSON"), Context{yield}); + auto const output = handler.process(json::parse(R"JSON({"tx_hash": "123"})JSON"), Context{yield}); ASSERT_FALSE(output); auto const err = rpc::makeError(output.result.error()); EXPECT_EQ(err.at("error").as_string(), "invalidParams"); diff --git a/tests/unit/rpc/handlers/TxTests.cpp b/tests/unit/rpc/handlers/TxTests.cpp index 3fda9bee..09b4a711 100644 --- a/tests/unit/rpc/handlers/TxTests.cpp +++ b/tests/unit/rpc/handlers/TxTests.cpp @@ -846,20 +846,20 @@ TEST_F(RPCTxTest, CTIDNotMatch) TEST_F(RPCTxTest, ReturnCTIDForTxInput) { static constexpr auto kOUT = R"JSON({ - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Fee":"2", - "Sequence":100, - "SigningPubKey":"74657374", + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Fee": "2", + "Sequence": 100, + "SigningPubKey": "74657374", "TakerGets": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "value":"200" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "value": "200" }, - "ctid":"C000006400640002", - "TakerPays":"300", - "TransactionType":"OfferCreate", - "hash":"2E2FBAAFF767227FE4381C4BE9855986A6B9F96C62F6E443731AB36F7BBB8A08", + "ctid": "C000006400640002", + "TakerPays": "300", + "TransactionType": "OfferCreate", + "hash": "2E2FBAAFF767227FE4381C4BE9855986A6B9F96C62F6E443731AB36F7BBB8A08", "meta": { "AffectedNodes": @@ -867,26 +867,26 @@ TEST_F(RPCTxTest, ReturnCTIDForTxInput) { "CreatedNode": { - "LedgerEntryType":"Offer", + "LedgerEntryType": "Offer", "NewFields": { - "TakerGets":"200", + "TakerGets": "200", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"300" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "300" } } } } ], - "TransactionIndex":100, - "TransactionResult":"tesSUCCESS" + "TransactionIndex": 100, + "TransactionResult": "tesSUCCESS" }, - "date":123456, - "ledger_index":100, - "inLedger":100, + "date": 123456, + "ledger_index": 100, + "inLedger": 100, "validated": true })JSON"; @@ -920,19 +920,19 @@ TEST_F(RPCTxTest, ReturnCTIDForTxInput) TEST_F(RPCTxTest, NotReturnCTIDIfETLNotAvailable) { static constexpr auto kOUT = R"JSON({ - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Fee":"2", - "Sequence":100, - "SigningPubKey":"74657374", + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Fee": "2", + "Sequence": 100, + "SigningPubKey": "74657374", "TakerGets": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "value":"200" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "value": "200" }, - "TakerPays":"300", - "TransactionType":"OfferCreate", - "hash":"2E2FBAAFF767227FE4381C4BE9855986A6B9F96C62F6E443731AB36F7BBB8A08", + "TakerPays": "300", + "TransactionType": "OfferCreate", + "hash": "2E2FBAAFF767227FE4381C4BE9855986A6B9F96C62F6E443731AB36F7BBB8A08", "meta": { "AffectedNodes": @@ -940,26 +940,26 @@ TEST_F(RPCTxTest, NotReturnCTIDIfETLNotAvailable) { "CreatedNode": { - "LedgerEntryType":"Offer", + "LedgerEntryType": "Offer", "NewFields": { - "TakerGets":"200", + "TakerGets": "200", "TakerPays": { - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"300" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "300" } } } } ], - "TransactionIndex":100, - "TransactionResult":"tesSUCCESS" + "TransactionIndex": 100, + "TransactionResult": "tesSUCCESS" }, - "date":123456, - "ledger_index":100, - "inLedger":100, + "date": 123456, + "ledger_index": 100, + "inLedger": 100, "validated": true })JSON"; @@ -994,20 +994,20 @@ TEST_F(RPCTxTest, ViaCTID) { static auto const kOUT = fmt::format( R"JSON({{ - "Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "Fee":"2", - "Sequence":100, - "SigningPubKey":"74657374", + "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "Fee": "2", + "Sequence": 100, + "SigningPubKey": "74657374", "TakerGets": {{ - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", - "value":"200" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", + "value": "200" }}, - "ctid":"{}", - "TakerPays":"300", - "TransactionType":"OfferCreate", - "hash":"2E2FBAAFF767227FE4381C4BE9855986A6B9F96C62F6E443731AB36F7BBB8A08", + "ctid": "{}", + "TakerPays": "300", + "TransactionType": "OfferCreate", + "hash": "2E2FBAAFF767227FE4381C4BE9855986A6B9F96C62F6E443731AB36F7BBB8A08", "meta": {{ "AffectedNodes": @@ -1015,26 +1015,26 @@ TEST_F(RPCTxTest, ViaCTID) {{ "CreatedNode": {{ - "LedgerEntryType":"Offer", + "LedgerEntryType": "Offer", "NewFields": {{ - "TakerGets":"200", + "TakerGets": "200", "TakerPays": {{ - "currency":"0158415500000000C1F76FF6ECB0BAC600000000", - "issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", - "value":"300" + "currency": "0158415500000000C1F76FF6ECB0BAC600000000", + "issuer": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", + "value": "300" }} }} }} }} ], - "TransactionIndex":1, - "TransactionResult":"tesSUCCESS" + "TransactionIndex": 1, + "TransactionResult": "tesSUCCESS" }}, - "date":123456, - "ledger_index":{}, - "inLedger":{}, + "date": 123456, + "ledger_index": {}, + "inLedger": {}, "validated": true }})JSON", kCTID, diff --git a/tests/unit/rpc/handlers/UnsubscribeTests.cpp b/tests/unit/rpc/handlers/UnsubscribeTests.cpp index 94e0f744..0c3e5914 100644 --- a/tests/unit/rpc/handlers/UnsubscribeTests.cpp +++ b/tests/unit/rpc/handlers/UnsubscribeTests.cpp @@ -568,7 +568,7 @@ TEST_F(RPCUnsubscribeTest, Streams) { auto const input = json::parse( R"JSON({ - "streams": ["transactions_proposed","transactions","validations","manifests","book_changes","ledger"] + "streams": ["transactions_proposed", "transactions", "validations", "manifests", "book_changes", "ledger"] })JSON" ); @@ -591,7 +591,7 @@ TEST_F(RPCUnsubscribeTest, Accounts) { auto const input = json::parse(fmt::format( R"JSON({{ - "accounts": ["{}","{}"] + "accounts": ["{}", "{}"] }})JSON", kACCOUNT, kACCOUNT2 @@ -613,7 +613,7 @@ TEST_F(RPCUnsubscribeTest, AccountsProposed) { auto const input = json::parse(fmt::format( R"JSON({{ - "accounts_proposed": ["{}","{}"] + "accounts_proposed": ["{}", "{}"] }})JSON", kACCOUNT, kACCOUNT2 diff --git a/tests/unit/util/config/ConfigFileJsonTests.cpp b/tests/unit/util/config/ConfigFileJsonTests.cpp index cb6d2feb..d639e938 100644 --- a/tests/unit/util/config/ConfigFileJsonTests.cpp +++ b/tests/unit/util/config/ConfigFileJsonTests.cpp @@ -117,7 +117,7 @@ INSTANTIATE_TEST_CASE_P( .configStr = R"JSON({ "level_0": { "int": 42, - "level_1":{ + "level_1": { "double": 123.456, "level_2": { "bool": true, diff --git a/tests/unit/web/RPCServerHandlerTests.cpp b/tests/unit/web/RPCServerHandlerTests.cpp index 300d91a0..f7e76488 100644 --- a/tests/unit/web/RPCServerHandlerTests.cpp +++ b/tests/unit/web/RPCServerHandlerTests.cpp @@ -186,7 +186,7 @@ TEST_F(WebRPCServerHandlerTest, WsNormalPath) static constexpr auto kRESULT = "{}"; static constexpr auto kRESPONSE = R"JSON({ - "result":{}, + "result": {}, "id": 99, "status": "success", "type": "response", @@ -261,12 +261,12 @@ TEST_F(WebRPCServerHandlerTest, HTTPForwardedPath) "forwarded": true })JSON"; static constexpr auto kRESPONSE = R"JSON({ - "result":{ + "result": { "index": 1, "status": "success" }, "forwarded": true, - "warnings":[ + "warnings": [ { "id": 2001, "message": "This is a clio server. clio only serves validated data. If you want to talk to rippled, include 'ledger_index':'current' in your request" @@ -307,7 +307,7 @@ TEST_F(WebRPCServerHandlerTest, HTTPForwardedErrorPath) "forwarded": true })JSON"; static constexpr auto kRESPONSE = R"JSON({ - "result":{ + "result": { "error": "error", "error_code": 123, "error_message": "error message", @@ -315,7 +315,7 @@ TEST_F(WebRPCServerHandlerTest, HTTPForwardedErrorPath) "type": "response" }, "forwarded": true, - "warnings":[ + "warnings": [ { "id": 2001, "message": "This is a clio server. clio only serves validated data. If you want to talk to rippled, include 'ledger_index':'current' in your request" @@ -355,7 +355,7 @@ TEST_F(WebRPCServerHandlerTest, WsForwardedPath) "forwarded": true })JSON"; static constexpr auto kRESPONSE = R"JSON({ - "result":{ + "result": { "index": 1 }, "forwarded": true, @@ -697,7 +697,7 @@ TEST_F(WebRPCServerHandlerTest, WsMissingCommand) "status": "error", "type": "response", "id": 99, - "request":{ + "request": { "command2": "server_info", "id": 99 } @@ -877,11 +877,11 @@ TEST_F(WebRPCServerHandlerTest, WsOutdated) static constexpr auto kRESULT = "{}"; static constexpr auto kRESPONSE = R"JSON({ - "result":{}, + "result": {}, "id": 99, "status": "success", "type": "response", - "warnings":[ + "warnings": [ { "id": 2001, "message": "This is a clio server. clio only serves validated data. If you want to talk to rippled, include 'ledger_index':'current' in your request" diff --git a/tests/unit/web/ng/RPCServerHandlerTests.cpp b/tests/unit/web/ng/RPCServerHandlerTests.cpp index f9bd8260..2d121364 100644 --- a/tests/unit/web/ng/RPCServerHandlerTests.cpp +++ b/tests/unit/web/ng/RPCServerHandlerTests.cpp @@ -326,7 +326,7 @@ TEST_F(NgRpcServerHandlerTest, HandleRequest_BuildResponseFailed) { backend_->setRange(0, 1); runSpawn([&](boost::asio::yield_context yield) { - std::string const requestStr = R"JSON({"method":"some_method"})JSON"; + std::string const requestStr = R"JSON({"method": "some_method"})JSON"; auto const request = makeHttpRequest(requestStr); EXPECT_CALL(dosguard_, isOk(ip_)).WillOnce(Return(true)); @@ -357,7 +357,7 @@ TEST_F(NgRpcServerHandlerTest, HandleRequest_BuildResponseThrewAnException) { backend_->setRange(0, 1); runSpawn([&](boost::asio::yield_context yield) { - std::string const requestStr = R"JSON({"method":"some_method"})JSON"; + std::string const requestStr = R"JSON({"method": "some_method"})JSON"; auto const request = makeHttpRequest(requestStr); EXPECT_CALL(dosguard_, isOk(ip_)).WillOnce(Return(true)); @@ -383,7 +383,7 @@ TEST_F(NgRpcServerHandlerTest, HandleRequest_Successful_HttpRequest) { backend_->setRange(0, 1); runSpawn([&](boost::asio::yield_context yield) { - std::string const requestStr = R"JSON({"method":"some_method"})JSON"; + std::string const requestStr = R"JSON({"method": "some_method"})JSON"; auto const request = makeHttpRequest(requestStr); EXPECT_CALL(dosguard_, isOk(ip_)).WillOnce(Return(true)); @@ -416,7 +416,7 @@ TEST_F(NgRpcServerHandlerTest, HandleRequest_OutdatedWarning) { backend_->setRange(0, 1); runSpawn([&](boost::asio::yield_context yield) { - std::string const requestStr = R"JSON({"method":"some_method"})JSON"; + std::string const requestStr = R"JSON({"method": "some_method"})JSON"; auto const request = makeHttpRequest(requestStr); EXPECT_CALL(dosguard_, isOk(ip_)).WillOnce(Return(true)); @@ -455,7 +455,7 @@ TEST_F(NgRpcServerHandlerTest, HandleRequest_Successful_HttpRequest_Forwarded) { backend_->setRange(0, 1); runSpawn([&](boost::asio::yield_context yield) { - std::string const requestStr = R"JSON({"method":"some_method"})JSON"; + std::string const requestStr = R"JSON({"method": "some_method"})JSON"; auto const request = makeHttpRequest(requestStr); EXPECT_CALL(dosguard_, isOk(ip_)).WillOnce(Return(true)); @@ -491,7 +491,7 @@ TEST_F(NgRpcServerHandlerTest, HandleRequest_Successful_HttpRequest_HasError) { backend_->setRange(0, 1); runSpawn([&](boost::asio::yield_context yield) { - std::string const requestStr = R"JSON({"method":"some_method"})JSON"; + std::string const requestStr = R"JSON({"method": "some_method"})JSON"; auto const request = makeHttpRequest(requestStr); EXPECT_CALL(dosguard_, isOk(ip_)).WillOnce(Return(true)); @@ -543,7 +543,7 @@ TEST_F(NgRpcServerHandlerWsTest, HandleRequest_Successful_WsRequest) backend_->setRange(0, 1); runSpawn([&](boost::asio::yield_context yield) { Request::HttpHeaders const headers; - std::string const requestStr = R"JSON({"method":"some_method", "id": 1234, "api_version": 1})JSON"; + std::string const requestStr = R"JSON({"method": "some_method", "id": 1234, "api_version": 1})JSON"; auto const request = Request(requestStr, headers); EXPECT_CALL(dosguard_, isOk(ip_)).WillOnce(Return(true)); @@ -578,7 +578,7 @@ TEST_F(NgRpcServerHandlerWsTest, HandleRequest_Successful_WsRequest_HasError) backend_->setRange(0, 1); runSpawn([&](boost::asio::yield_context yield) { Request::HttpHeaders const headers; - std::string const requestStr = R"JSON({"method":"some_method", "id": 1234, "api_version": 1})JSON"; + std::string const requestStr = R"JSON({"method": "some_method", "id": 1234, "api_version": 1})JSON"; auto const request = Request(requestStr, headers); EXPECT_CALL(dosguard_, isOk(ip_)).WillOnce(Return(true));