mirror of
https://github.com/XRPLF/rippled.git
synced 2026-06-07 02:36:47 +00:00
Merge branch 'develop' into ximinez/online-delete-gaps
This commit is contained in:
@@ -36,8 +36,7 @@
|
||||
#include <thread>
|
||||
#include <utility>
|
||||
|
||||
namespace xrpl {
|
||||
namespace test {
|
||||
namespace xrpl::test {
|
||||
|
||||
class SHAMapStore_test : public beast::unit_test::suite
|
||||
{
|
||||
@@ -181,10 +180,10 @@ public:
|
||||
auto ledgerTmp = env.rpc("ledger", "0");
|
||||
BEAST_EXPECT(bad(ledgerTmp));
|
||||
|
||||
ledgers.emplace(std::make_pair(1, env.rpc("ledger", "1")));
|
||||
ledgers.emplace(1, env.rpc("ledger", "1"));
|
||||
BEAST_EXPECT(goodLedger(env, ledgers[1], "1"));
|
||||
|
||||
ledgers.emplace(std::make_pair(2, env.rpc("ledger", "2")));
|
||||
ledgers.emplace(2, env.rpc("ledger", "2"));
|
||||
BEAST_EXPECT(goodLedger(env, ledgers[2], "2"));
|
||||
|
||||
ledgerTmp = env.rpc("ledger", "current");
|
||||
@@ -211,7 +210,7 @@ public:
|
||||
|
||||
for (auto i = 3; i < deleteInterval + lastRotated; ++i)
|
||||
{
|
||||
ledgers.emplace(std::make_pair(i, env.rpc("ledger", std::to_string(i))));
|
||||
ledgers.emplace(i, env.rpc("ledger", std::to_string(i)));
|
||||
BEAST_EXPECT(
|
||||
goodLedger(env, ledgers[i], std::to_string(i), true) &&
|
||||
!getHash(ledgers[i]).empty());
|
||||
@@ -248,7 +247,7 @@ public:
|
||||
ledgerTmp = env.rpc("ledger", "current");
|
||||
BEAST_EXPECT(goodLedger(env, ledgerTmp, std::to_string(i + 3)));
|
||||
|
||||
ledgers.emplace(std::make_pair(i, env.rpc("ledger", std::to_string(i))));
|
||||
ledgers.emplace(i, env.rpc("ledger", std::to_string(i)));
|
||||
BEAST_EXPECT(
|
||||
store.getLastRotated() == lastRotated || i == lastRotated + deleteInterval - 2);
|
||||
BEAST_EXPECT(
|
||||
@@ -755,5 +754,4 @@ public:
|
||||
// VFALCO This test fails because of thread asynchronous issues
|
||||
BEAST_DEFINE_TESTSUITE(SHAMapStore, app, xrpl);
|
||||
|
||||
} // namespace test
|
||||
} // namespace xrpl
|
||||
} // namespace xrpl::test
|
||||
|
||||
Reference in New Issue
Block a user