Remove tapENABLE_TESTING.

This commit is contained in:
Scott Schurr
2016-01-14 17:42:52 -08:00
committed by Edward Hennis
parent 749b4adc7c
commit 0fca91c6c1
8 changed files with 37 additions and 81 deletions

View File

@@ -144,7 +144,7 @@ static Json::Value checkPayment(
AccountID const& srcAddressID,
Role const role,
Application& app,
std::shared_ptr<ReadView const>& ledger,
std::shared_ptr<ReadView const> const& ledger,
bool doPath)
{
// Only path find for Payments.
@@ -339,7 +339,7 @@ transactionPreProcessImpl (
SigningForParams& signingArgs,
std::chrono::seconds validatedLedgerAge,
Application& app,
std::shared_ptr<ReadView const> ledger)
std::shared_ptr<ReadView const> const& ledger)
{
auto j = app.journal ("RPCHandler");
@@ -515,7 +515,7 @@ transactionPreProcessImpl (
static
std::pair <Json::Value, Transaction::pointer>
transactionConstructImpl (std::shared_ptr<STTx const> const& stpTrans,
Rules const& rules, Application& app, ApplyFlags flags)
Rules const& rules, Application& app)
{
std::pair <Json::Value, Transaction::pointer> ret;
@@ -547,7 +547,7 @@ transactionConstructImpl (std::shared_ptr<STTx const> const& stpTrans,
// Check the signature if that's called for.
auto sttxNew = std::make_shared<STTx const> (sit);
if (checkValidity(app.getHashRouter(),
*sttxNew, rules, app.config(), flags).first != Validity::Valid)
*sttxNew, rules, app.config()).first != Validity::Valid)
{
ret.first = RPC::make_error (rpcINTERNAL,
"Invalid signature.");
@@ -624,7 +624,7 @@ Json::Value checkFee (
bool doAutoFill,
Config const& config,
LoadFeeTrack const& feeTrack,
std::shared_ptr<ReadView const>& ledger)
std::shared_ptr<ReadView const> const& ledger)
{
Json::Value& tx (request[jss::tx_json]);
if (tx.isMember (jss::Fee))
@@ -696,8 +696,7 @@ Json::Value transactionSign (
Role role,
std::chrono::seconds validatedLedgerAge,
Application& app,
std::shared_ptr<ReadView const> ledger,
ApplyFlags flags)
std::shared_ptr<ReadView const> const& ledger)
{
using namespace detail;
@@ -716,7 +715,7 @@ Json::Value transactionSign (
// Make sure the STTx makes a legitimate Transaction.
std::pair <Json::Value, Transaction::pointer> txn =
transactionConstructImpl (
preprocResult.second, ledger->rules(), app, flags);
preprocResult.second, ledger->rules(), app);
if (!txn.second)
return txn.first;
@@ -731,9 +730,8 @@ Json::Value transactionSubmit (
Role role,
std::chrono::seconds validatedLedgerAge,
Application& app,
std::shared_ptr<ReadView const> ledger,
ProcessTransactionFn const& processTransaction,
ApplyFlags flags)
std::shared_ptr<ReadView const> const& ledger,
ProcessTransactionFn const& processTransaction)
{
using namespace detail;
@@ -752,7 +750,7 @@ Json::Value transactionSubmit (
// Make sure the STTx makes a legitimate Transaction.
std::pair <Json::Value, Transaction::pointer> txn =
transactionConstructImpl (
preprocResult.second, ledger->rules(), app, flags);
preprocResult.second, ledger->rules(), app);
if (!txn.second)
return txn.first;
@@ -857,8 +855,7 @@ Json::Value transactionSignFor (
Role role,
std::chrono::seconds validatedLedgerAge,
Application& app,
std::shared_ptr<ReadView const> ledger,
ApplyFlags flags)
std::shared_ptr<ReadView const> const& ledger)
{
auto j = app.journal ("RPCHandler");
JLOG (j.debug) << "transactionSignFor: " << jvRequest;
@@ -953,8 +950,7 @@ Json::Value transactionSignFor (
// Make sure the STTx makes a legitimate Transaction.
std::pair <Json::Value, Transaction::pointer> txn =
transactionConstructImpl (
sttx, ledger->rules(), app, flags);
transactionConstructImpl (sttx, ledger->rules(), app);
if (!txn.second)
return txn.first;
@@ -969,9 +965,8 @@ Json::Value transactionSubmitMultiSigned (
Role role,
std::chrono::seconds validatedLedgerAge,
Application& app,
std::shared_ptr<ReadView const> ledger,
ProcessTransactionFn const& processTransaction,
ApplyFlags flags)
std::shared_ptr<ReadView const> const& ledger,
ProcessTransactionFn const& processTransaction)
{
auto j = app.journal ("RPCHandler");
JLOG (j.debug)
@@ -1125,7 +1120,7 @@ Json::Value transactionSubmitMultiSigned (
// Make sure the SerializedTransaction makes a legitimate Transaction.
std::pair <Json::Value, Transaction::pointer> txn =
transactionConstructImpl (stpTrans, ledger->rules(), app, flags);
transactionConstructImpl (stpTrans, ledger->rules(), app);
if (!txn.second)
return txn.first;