ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use tapENABLE_TESTING for TxQ.

Browse Source 
* Enable FeeEscalation feature in TxQ tests.
* Elapsed time for simulated consensus.
This commit is contained in:
Edward Hennis
2015-12-15 14:06:50 -05:00
committed by Vinnie Falco
parent a5583de6e6
commit 1bce85d7b6
10 changed files with 136 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ripple/test/jtx/impl/Env.cpp
View File

@@ -28,10 +28,10 @@
#include <ripple/test/jtx/seq.h>
#include <ripple/test/jtx/sig.h>
#include <ripple/test/jtx/utility.h>
#include <ripple/app/tx/apply.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/LedgerTiming.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/misc/TxQ.h>
#include <ripple/basics/contract.h>
#include <ripple/basics/Slice.h>
#include <ripple/core/ConfigSections.h>
@@ -113,12 +113,13 @@ Env::closed()
}
void
Env::close(NetClock::time_point closeTime)
Env::close(NetClock::time_point closeTime,
boost::optional<std::chrono::milliseconds> consensusDelay)
{
// Round up to next distinguishable value
closeTime += closed()->info().closeTimeResolution - 1s;
bundle_.timeKeeper->set(closeTime);
app().getOPs().acceptLedger();
app().getOPs().acceptLedger(consensusDelay);
bundle_.timeKeeper->set(
closed()->info().closeTime);
}
@@ -260,8 +261,8 @@ Env::submit (JTx const& jt)
app().openLedger().modify(
[&](OpenView& view, beast::Journal j)
{
std::tie(ter_, didApply) = ripple::apply(
app(), view, *jt.stx, applyFlags(),
std::tie(ter_, didApply) = app().getTxQ().apply(
app(), view, jt.stx, applyFlags(),
beast::Journal{});
return didApply;
});