chore: Update libxrpl to 3.2.0 (#3114)

This commit is contained in:
Sergey Kuznetsov
2026-06-25 11:19:12 +01:00
committed by GitHub
parent 3673586be3
commit 9b04d64a0e
257 changed files with 6174 additions and 6312 deletions

View File

@@ -39,7 +39,6 @@ constexpr auto kLedgerHash = "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25
} // namespace
namespace json = boost::json;
using namespace feed;
using namespace feed::impl;
using namespace data;
@@ -83,8 +82,8 @@ TEST_F(SubscriptionManagerAsyncTest, MultipleThreadCtx)
EXPECT_CALL(*sessionPtr_, send(testing::_)).Times(testing::AtMost(2));
subscriptionManagerPtr_->forwardManifest(json::parse(kJsonManifest).get_object());
subscriptionManagerPtr_->forwardValidation(json::parse(kJsonValidation).get_object());
subscriptionManagerPtr_->forwardManifest(boost::json::parse(kJsonManifest).get_object());
subscriptionManagerPtr_->forwardValidation(boost::json::parse(kJsonValidation).get_object());
}
TEST_F(SubscriptionManagerAsyncTest, MultipleThreadCtxSessionDieEarly)
@@ -98,10 +97,10 @@ TEST_F(SubscriptionManagerAsyncTest, MultipleThreadCtxSessionDieEarly)
session_.reset();
subscriptionManagerPtr_->forwardManifest(
json::parse(R"JSON({"manifest": "test"})JSON").get_object()
boost::json::parse(R"JSON({"manifest": "test"})JSON").get_object()
);
subscriptionManagerPtr_->forwardValidation(
json::parse(R"JSON({"validation": "test"})JSON").get_object()
boost::json::parse(R"JSON({"validation": "test"})JSON").get_object()
);
}
@@ -151,10 +150,10 @@ TEST_F(SubscriptionManagerTest, ReportCurrentSubscriber)
subscriptionManagerPtr_->subProposedAccount(account, session1);
subscriptionManagerPtr_->subProposedAccount(account, session2);
auto const issue1 = getIssue(kCurrency, kIssuer);
ripple::Book const book{ripple::xrpIssue(), issue1, std::nullopt};
xrpl::Book const book{xrpl::xrpIssue(), issue1, std::nullopt};
subscriptionManagerPtr_->subBook(book, session1);
subscriptionManagerPtr_->subBook(book, session2);
EXPECT_EQ(subscriptionManagerPtr_->report(), json::parse(kReportReturn));
EXPECT_EQ(subscriptionManagerPtr_->report(), boost::json::parse(kReportReturn));
// count down when unsub manually
subscriptionManagerPtr_->unsubBookChanges(session1);
@@ -170,7 +169,7 @@ TEST_F(SubscriptionManagerTest, ReportCurrentSubscriber)
auto const account2 = getAccountIdWithString(kAccount2);
subscriptionManagerPtr_->unsubAccount(account2, session1);
subscriptionManagerPtr_->unsubProposedAccount(account2, session1);
auto checkResult = [](json::object reportReturn, int result) {
auto checkResult = [](boost::json::object reportReturn, int result) {
EXPECT_EQ(reportReturn["book_changes"], result);
EXPECT_EQ(reportReturn["validations"], result);
EXPECT_EQ(reportReturn["transactions_proposed"], result);
@@ -196,11 +195,11 @@ TEST_F(SubscriptionManagerTest, ManifestTest)
EXPECT_CALL(*sessionPtr_, onDisconnect);
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDummyManifest)));
subscriptionManagerPtr_->subManifest(session_);
subscriptionManagerPtr_->forwardManifest(json::parse(kDummyManifest).get_object());
subscriptionManagerPtr_->forwardManifest(boost::json::parse(kDummyManifest).get_object());
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDummyManifest))).Times(0);
subscriptionManagerPtr_->unsubManifest(session_);
subscriptionManagerPtr_->forwardManifest(json::parse(kDummyManifest).get_object());
subscriptionManagerPtr_->forwardManifest(boost::json::parse(kDummyManifest).get_object());
}
TEST_F(SubscriptionManagerTest, ValidationTest)
@@ -209,11 +208,11 @@ TEST_F(SubscriptionManagerTest, ValidationTest)
EXPECT_CALL(*sessionPtr_, onDisconnect);
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDummy)));
subscriptionManagerPtr_->subValidation(session_);
subscriptionManagerPtr_->forwardValidation(json::parse(kDummy).get_object());
subscriptionManagerPtr_->forwardValidation(boost::json::parse(kDummy).get_object());
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDummy))).Times(0);
subscriptionManagerPtr_->unsubValidation(session_);
subscriptionManagerPtr_->forwardValidation(json::parse(kDummy).get_object());
subscriptionManagerPtr_->forwardValidation(boost::json::parse(kDummy).get_object());
}
TEST_F(SubscriptionManagerTest, BookChangesTest)
@@ -225,11 +224,10 @@ TEST_F(SubscriptionManagerTest, BookChangesTest)
auto const ledgerHeader = createLedgerHeader(kLedgerHash, 32);
auto transactions = std::vector<TransactionAndMetadata>{};
auto trans1 = TransactionAndMetadata();
ripple::STObject const obj = createPaymentTransactionObject(kAccount1, kAccount2, 1, 1, 32);
xrpl::STObject const obj = createPaymentTransactionObject(kAccount1, kAccount2, 1, 1, 32);
trans1.transaction = obj.getSerializer().peekData();
trans1.ledgerSequence = 32;
ripple::STObject const metaObj =
createMetaDataForBookChange(kCurrency, kIssuer, 22, 1, 3, 3, 1);
xrpl::STObject const metaObj = createMetaDataForBookChange(kCurrency, kIssuer, 22, 1, 3, 3, 1);
trans1.metadata = metaObj.getSerializer().peekData();
transactions.push_back(trans1);
static constexpr auto kBookChangePublish =
@@ -289,14 +287,14 @@ TEST_F(SubscriptionManagerTest, LedgerTest)
EXPECT_CALL(*sessionPtr_, onDisconnect);
auto const res = subscriptionManagerPtr_->subLedger(yield, session_);
// check the response
EXPECT_EQ(res, json::parse(kLedgerResponse));
EXPECT_EQ(res, boost::json::parse(kLedgerResponse));
});
ctx.run();
EXPECT_EQ(subscriptionManagerPtr_->report()["ledger"], 1);
// test publish
auto const ledgerHeader2 = createLedgerHeader(kLedgerHash, 31);
auto fee2 = ripple::Fees();
auto fee2 = xrpl::Fees();
fee2.reserve = 10;
static constexpr auto kLedgerPub =
R"JSON({
@@ -323,7 +321,7 @@ TEST_F(SubscriptionManagerTest, TransactionTest)
{
auto const issue1 = getIssue(kCurrency, kIssuer);
auto const account = getAccountIdWithString(kIssuer);
ripple::Book const book{ripple::xrpIssue(), issue1, std::nullopt};
xrpl::Book const book{xrpl::xrpIssue(), issue1, std::nullopt};
EXPECT_CALL(*sessionPtr_, onDisconnect).Times(3);
subscriptionManagerPtr_->subBook(book, session_);
subscriptionManagerPtr_->subTransactions(session_);
@@ -477,7 +475,7 @@ TEST_F(SubscriptionManagerTest, ProposedTransactionTest)
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kDummyTransaction))).Times(2);
EXPECT_CALL(*sessionPtr_, send(sharedStringJsonEq(kOrderbookPublish))).Times(2);
subscriptionManagerPtr_->forwardProposedTransaction(
json::parse(kDummyTransaction).get_object()
boost::json::parse(kDummyTransaction).get_object()
);
auto const ledgerHeader = createLedgerHeader(kLedgerHash, 33);