ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-07 02:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ximinez/online-delete-gaps

Browse Source
This commit is contained in:
Ed Hennis
2026-03-30 21:29:37 -04:00
committed by GitHub
parent 3e94546acc 5c8dfe5456
commit f20425fa4f
928 changed files with 73827 additions and 9654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/app/SHAMapStore_test.cpp
View File

@@ -35,7 +35,7 @@ class SHAMapStore_test : public beast::unit_test::suite
return cfg;
}
bool
static bool
goodLedger(jtx::Env& env, Json::Value const& json, std::string ledgerID, bool checkDB = false)
{
auto good = json.isMember(jss::result) && !RPC::contains_error(json[jss::result]) &&
@@ -74,7 +74,7 @@ class SHAMapStore_test : public beast::unit_test::suite
outTxHash == ledger[jss::transaction_hash].asString();
}
bool
static bool
bad(Json::Value const& json, error_code_i error = rpcLGR_NOT_FOUND)
{
return json.isMember(jss::result) && RPC::contains_error(json[jss::result]) &&
@@ -191,7 +191,7 @@ public:
ledgers.emplace(std::make_pair(i, env.rpc("ledger", std::to_string(i))));
BEAST_EXPECT(
goodLedger(env, ledgers[i], std::to_string(i), true) &&
getHash(ledgers[i]).length());
!getHash(ledgers[i]).empty());
}
ledgerCheck(env, deleteInterval + 1, 2);
@@ -230,7 +230,7 @@ public:
store.getLastRotated() == lastRotated || i == lastRotated + deleteInterval - 2);
BEAST_EXPECT(
goodLedger(env, ledgers[i], std::to_string(i), true) &&
getHash(ledgers[i]).length());
!getHash(ledgers[i]).empty());
}
store.rendezvous();
@@ -347,9 +347,9 @@ public:
BEAST_EXPECT(lastRotated == store.getLastRotated());
// This does not kick off a cleanup
canDelete = env.rpc("can_delete", std::to_string(ledgerSeq + deleteInterval / 2));
canDelete = env.rpc("can_delete", std::to_string(ledgerSeq + (deleteInterval / 2)));
BEAST_EXPECT(!RPC::contains_error(canDelete[jss::result]));
BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == ledgerSeq + deleteInterval / 2);
BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == ledgerSeq + (deleteInterval / 2));
store.rendezvous();
@@ -482,7 +482,7 @@ public:
section,
megabytes(env.app().config().getValueFor(SizedItem::burstSize, std::nullopt)),
scheduler,
env.app().logs().journal("NodeStoreTest"))};
env.app().getJournal("NodeStoreTest"))};
backend->open();
return backend;
}
@@ -515,7 +515,7 @@ public:
std::move(writableBackend),
std::move(archiveBackend),
nscfg,
env.app().logs().journal("NodeStoreTest"));
env.app().getJournal("NodeStoreTest"));
/////////////////////////////////////////////////////////////
// Check basic functionality