Clean up src/ripple/app/tx directory:

* Move InboundTransactions to app/ledger
* Move TransactionAcquire to app/ledger
* Move LocalTxs to app/ledger
* Move Transaction to app/misc
* Move TransactionMaster to app/ledger
This commit is contained in:
Edward Hennis
2015-10-15 16:48:59 -04:00
parent 7d0d89faae
commit 6464d1abc1
50 changed files with 161 additions and 143 deletions

View File

@@ -21,6 +21,7 @@
#include <ripple/rpc/impl/TransactionSign.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/app/paths/Pathfinder.h>
#include <ripple/app/tx/apply.h> // Validity::Valid
#include <ripple/basics/Log.h>

View File

@@ -29,6 +29,7 @@ namespace ripple {
// Forward declarations
class Application;
class LoadFeeTrack;
class Transaction;
namespace RPC {
@@ -63,12 +64,12 @@ Json::Value checkFee (
// Return a std::function<> that calls NetworkOPs::processTransaction.
using ProcessTransactionFn =
std::function<void (Transaction::pointer& transaction,
std::function<void (std::shared_ptr<Transaction>& transaction,
bool bAdmin, bool bLocal, NetworkOPs::FailHard failType)>;
inline ProcessTransactionFn getProcessTxnFn (NetworkOPs& netOPs)
{
return [&netOPs](Transaction::pointer& transaction,
return [&netOPs](std::shared_ptr<Transaction>& transaction,
bool bAdmin, bool bLocal, NetworkOPs::FailHard failType)
{
netOPs.processTransaction(transaction, bAdmin, bLocal, failType);

View File

@@ -18,6 +18,7 @@
//==============================================================================
#include <ripple/rpc/impl/Utilities.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/json/json_value.h>
#include <ripple/protocol/JsonFields.h>
#include <ripple/protocol/ErrorCodes.h>
@@ -32,7 +33,7 @@ void
addPaymentDeliveredAmount (
Json::Value& meta,
RPC::Context& context,
Transaction::pointer transaction,
std::shared_ptr<Transaction> transaction,
TxMeta::pointer transactionMeta)
{
// We only want to add a "delivered_amount" field if the transaction

View File

@@ -21,7 +21,6 @@
#define RIPPLE_RPC_IMPL_UTILITIES_H_INCLUDED
#include <ripple/ledger/TxMeta.h>
#include <ripple/app/tx/Transaction.h>
#include <ripple/rpc/impl/Tuning.h>
namespace Json {
@@ -30,6 +29,8 @@ class Value;
namespace ripple {
class Transaction;
namespace RPC {
struct Context;
@@ -38,7 +39,7 @@ void
addPaymentDeliveredAmount (
Json::Value&,
Context&,
Transaction::pointer,
std::shared_ptr<Transaction>,
TxMeta::pointer);
/** Inject JSON describing ledger entry