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

Simplify Transaction ordering unit test

Browse Source
This commit is contained in:
Edward Hennis
2016-03-30 10:38:53 -07:00
committed by Nik Bougalis
parent ff7a2c63f2
commit f2cdeb7d9a
1 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/ripple/app/tests/Transaction_ordering_test.cpp
View File

@@ -25,30 +25,6 @@ namespace test {
struct Transaction_ordering_test : public beast::unit_test::suite
{
template <class Ftest>
void submitWait(jtx::Env& env, jtx::JTx const& tx, Ftest&& test)
{
using namespace std::chrono_literals;
std::condition_variable cv;
env.app().getJobQueue().postCoro(
jtCLIENT, "Coroutine-Test",
[&](std::shared_ptr<JobCoro> jc)
{
env(tx);
cv.notify_one();
});
{
std::mutex m;
std::unique_lock<std::mutex> lk(m);
// If stepping through this test in a debugger,
// make the timeout much longer, or use
//cv.wait(lk, test);
expect(cv.wait_for(lk, 2s, test));
}
}
void testCorrectOrder()
{
using namespace jtx;
@@ -99,11 +75,8 @@ struct Transaction_ordering_test : public beast::unit_test::suite
env(tx2, ter(terPRE_SEQ));
expect(env.seq(alice) == aliceSequence);
submitWait(env, tx1,
[&]()
{
return env.seq(alice) == aliceSequence + 2;
});
env(tx1);
env.app().getJobQueue().rendezvous();
expect(env.seq(alice) == aliceSequence + 2);
env.close();
@@ -144,11 +117,8 @@ struct Transaction_ordering_test : public beast::unit_test::suite
expect(env.seq(alice) == aliceSequence);
}
submitWait(env, tx[0],
[&]()
{
return env.seq(alice) == aliceSequence + 5;
});
env(tx[0]);
env.app().getJobQueue().rendezvous();
expect(env.seq(alice) == aliceSequence + 5);
env.close();