ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-28 15:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change ledgerInfo and replace with ledgerHeader (#1426)

Browse Source 
Fixes [#1396](https://github.com/XRPLF/clio/issues/1396)
This commit is contained in:
Peter Chen
2024-06-03 13:11:31 -04:00
committed by GitHub
parent 55b8134e6d
commit 967b85ca33
68 changed files with 687 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/unit/rpc/handlers/AccountChannelsTests.cpp
View File

@@ -270,7 +270,7 @@ TEST_F(RPCAccountChannelsHandlerTest, NonExistLedgerViaLedgerHash)
{
// mock fetchLedgerByHash return empty
ON_CALL(*backend, fetchLedgerByHash(ripple::uint256{LEDGERHASH}, _))
.WillByDefault(Return(std::optional<ripple::LedgerInfo>{}));
.WillByDefault(Return(std::optional<ripple::LedgerHeader>{}));
EXPECT_CALL(*backend, fetchLedgerByHash).Times(1);
auto const input = json::parse(fmt::format(
@@ -297,7 +297,7 @@ TEST_F(RPCAccountChannelsHandlerTest, NonExistLedgerViaLedgerStringIndex)
{
backend->setRange(10, 30);
// mock fetchLedgerBySequence return empty
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(std::optional<ripple::LedgerInfo>{}));
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(std::optional<ripple::LedgerHeader>{}));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
auto const input = json::parse(fmt::format(
R"({{
@@ -320,7 +320,7 @@ TEST_F(RPCAccountChannelsHandlerTest, NonExistLedgerViaLedgerIntIndex)
{
backend->setRange(10, 30);
// mock fetchLedgerBySequence return empty
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(std::optional<ripple::LedgerInfo>{}));
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(std::optional<ripple::LedgerHeader>{}));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
auto const input = json::parse(fmt::format(
R"({{
@@ -345,8 +345,8 @@ TEST_F(RPCAccountChannelsHandlerTest, NonExistLedgerViaLedgerHash2)
{
backend->setRange(10, 30);
// mock fetchLedgerByHash return ledger but seq is 31 > 30
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 31);
ON_CALL(*backend, fetchLedgerByHash(ripple::uint256{LEDGERHASH}, _)).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 31);
ON_CALL(*backend, fetchLedgerByHash(ripple::uint256{LEDGERHASH}, _)).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerByHash).Times(1);
auto const input = json::parse(fmt::format(
R"({{
@@ -394,8 +394,8 @@ TEST_F(RPCAccountChannelsHandlerTest, NonExistLedgerViaLedgerIndex2)
TEST_F(RPCAccountChannelsHandlerTest, NonExistAccount)
{
backend->setRange(10, 30);
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerByHash(ripple::uint256{LEDGERHASH}, _)).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerByHash(ripple::uint256{LEDGERHASH}, _)).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerByHash).Times(1);
// fetch account object return emtpy
ON_CALL(*backend, doFetchLedgerObject).WillByDefault(Return(std::optional<Blob>{}));
@@ -452,8 +452,8 @@ TEST_F(RPCAccountChannelsHandlerTest, DefaultParameterTest)
})";
backend->setRange(10, 30);
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
// fetch account object return something
auto account = GetAccountIDWithString(ACCOUNT);
@@ -497,8 +497,8 @@ TEST_F(RPCAccountChannelsHandlerTest, DefaultParameterTest)
TEST_F(RPCAccountChannelsHandlerTest, UseLimit)
{
backend->setRange(10, 30);
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(3);
// fetch account object return something
auto account = GetAccountIDWithString(ACCOUNT);
@@ -575,8 +575,8 @@ TEST_F(RPCAccountChannelsHandlerTest, UseLimit)
TEST_F(RPCAccountChannelsHandlerTest, UseDestination)
{
backend->setRange(10, 30);
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
// fetch account object return something
auto account = GetAccountIDWithString(ACCOUNT);
@@ -635,8 +635,8 @@ TEST_F(RPCAccountChannelsHandlerTest, UseDestination)
TEST_F(RPCAccountChannelsHandlerTest, EmptyChannel)
{
backend->setRange(10, 30);
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
// fetch account object return something
auto account = GetAccountIDWithString(ACCOUNT);
@@ -708,8 +708,8 @@ TEST_F(RPCAccountChannelsHandlerTest, OptionalResponseField)
})";
backend->setRange(10, 30);
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
// fetch account object return something
auto account = GetAccountIDWithString(ACCOUNT);
@@ -762,8 +762,8 @@ TEST_F(RPCAccountChannelsHandlerTest, MarkerOutput)
constexpr static auto nextPage = 99;
constexpr static auto limit = 15;
auto ownerDir2Kk = ripple::keylet::page(ripple::keylet::ownerDir(account), nextPage).key;
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
// fetch account object return something
auto fake = Blob{'f', 'a', 'k', 'e'};
@@ -830,8 +830,8 @@ TEST_F(RPCAccountChannelsHandlerTest, MarkerInput)
constexpr static auto nextPage = 99;
constexpr static auto limit = 15;
auto ownerDirKk = ripple::keylet::page(ripple::keylet::ownerDir(account), nextPage).key;
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
// fetch account object return something
auto fake = Blob{'f', 'a', 'k', 'e'};
@@ -882,8 +882,8 @@ TEST_F(RPCAccountChannelsHandlerTest, MarkerInput)
TEST_F(RPCAccountChannelsHandlerTest, LimitLessThanMin)
{
backend->setRange(10, 30);
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
// fetch account object return something
auto account = GetAccountIDWithString(ACCOUNT);
@@ -929,8 +929,8 @@ TEST_F(RPCAccountChannelsHandlerTest, LimitLessThanMin)
TEST_F(RPCAccountChannelsHandlerTest, LimitMoreThanMax)
{
backend->setRange(10, 30);
auto ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto ledgerHeader = CreateLedgerHeader(LEDGERHASH, 30);
ON_CALL(*backend, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader));
EXPECT_CALL(*backend, fetchLedgerBySequence).Times(1);
// fetch account object return something
auto account = GetAccountIDWithString(ACCOUNT);