Add enableTesting flag to applyTransactions

This commit is contained in:
Vinnie Falco
2015-06-30 11:33:38 -07:00
parent 4a2af70c2c
commit 2eec47415e
3 changed files with 13 additions and 7 deletions

View File

@@ -78,13 +78,13 @@ public:
@param retriableTransactions collect failed transactions in this set
@param openLgr true if applyLedger is open, else false.
*/
void
applyTransactions(
void applyTransactions (
SHAMap const* set,
Ledger::ref applyLedger,
Ledger::ref checkLedger,
CanonicalTXSet& retriableTransactions,
bool openLgr);
bool openLgr,
bool enableTesting = false);
} // ripple

View File

@@ -1724,11 +1724,15 @@ int applyTransaction (
TransactionEngine& engine,
std::shared_ptr<STTx const> const& txn,
bool openLedger,
bool retryAssured)
bool retryAssured,
bool enableTesting)
{
// Returns false if the transaction has need not be retried.
ViewFlags parms = openLedger ? tapOPEN_LEDGER : tapNONE;
if (enableTesting)
parms = parms | tapENABLE_TESTING;
if (retryAssured)
{
parms = static_cast<ViewFlags> (parms | tapRETRY);
@@ -1782,7 +1786,8 @@ void applyTransactions (
Ledger::ref applyLedger,
Ledger::ref checkLedger,
CanonicalTXSet& retriableTransactions,
bool openLgr)
bool openLgr,
bool enableTesting)
{
TransactionEngine engine (applyLedger);
@@ -1802,7 +1807,7 @@ void applyTransactions (
SerialIter sit (item->slice());
auto txn = std::make_shared<STTx>(sit);
if (applyTransaction (engine, txn, openLgr, true) == LedgerConsensusImp::resultRetry)
if (applyTransaction (engine, txn, openLgr, true, enableTesting) == LedgerConsensusImp::resultRetry)
{
// On failure, stash the failed transaction for
// later retry.
@@ -1832,7 +1837,7 @@ void applyTransactions (
try
{
switch (applyTransaction (engine, it->second,
openLgr, certainRetry))
openLgr, certainRetry, enableTesting))
{
case LedgerConsensusImp::resultSuccess:
it = retriableTransactions.erase (it);

View File

@@ -340,6 +340,7 @@ private:
};
//------------------------------------------------------------------------------
std::shared_ptr <LedgerConsensus>
make_LedgerConsensus (ConsensusImp& consensus, int previousProposers,
int previousConvergeTime, InboundTransactions& inboundTransactions,