Reformatting using AStyle

This commit is contained in:
Vinnie Falco
2013-06-14 08:45:13 -07:00
parent 36bd8f7173
commit 521e812fc4
294 changed files with 54609 additions and 47598 deletions

View File

@@ -9,113 +9,158 @@ class Database;
enum TransStatus
{
NEW = 0, // just received / generated
INVALID = 1, // no valid signature, insufficient funds
INCLUDED = 2, // added to the current ledger
CONFLICTED = 3, // losing to a conflicting transaction
COMMITTED = 4, // known to be in a ledger
HELD = 5, // not valid now, maybe later
REMOVED = 6, // taken out of a ledger
OBSOLETE = 7, // a compatible transaction has taken precedence
INCOMPLETE = 8 // needs more signatures
NEW = 0, // just received / generated
INVALID = 1, // no valid signature, insufficient funds
INCLUDED = 2, // added to the current ledger
CONFLICTED = 3, // losing to a conflicting transaction
COMMITTED = 4, // known to be in a ledger
HELD = 5, // not valid now, maybe later
REMOVED = 6, // taken out of a ledger
OBSOLETE = 7, // a compatible transaction has taken precedence
INCOMPLETE = 8 // needs more signatures
};
DEFINE_INSTANCE(Transaction);
DEFINE_INSTANCE (Transaction);
// This class is for constructing and examining transactions. Transactions are static so manipulation functions are unnecessary.
class Transaction : public boost::enable_shared_from_this<Transaction>, private IS_INSTANCE(Transaction)
class Transaction : public boost::enable_shared_from_this<Transaction>, private IS_INSTANCE (Transaction)
{
public:
typedef boost::shared_ptr<Transaction> pointer;
typedef const pointer& ref;
typedef boost::shared_ptr<Transaction> pointer;
typedef const pointer& ref;
public:
Transaction (SerializedTransaction::ref st, bool bValidate);
Transaction (SerializedTransaction::ref st, bool bValidate);
static Transaction::pointer sharedTransaction(Blob const& vucTransaction, bool bValidate);
static Transaction::pointer transactionFromSQL(Database* db, bool bValidate);
static Transaction::pointer sharedTransaction (Blob const & vucTransaction, bool bValidate);
static Transaction::pointer transactionFromSQL (Database * db, bool bValidate);
Transaction(
TransactionType ttKind,
const RippleAddress& naPublicKey, // To prove transaction is consistent and authorized.
const RippleAddress& naSourceAccount, // To identify the paying account.
uint32 uSeq, // To order transactions.
const STAmount& saFee, // Transaction fee.
uint32 uSourceTag); // User call back value.
Transaction (
TransactionType ttKind,
const RippleAddress & naPublicKey, // To prove transaction is consistent and authorized.
const RippleAddress & naSourceAccount, // To identify the paying account.
uint32 uSeq, // To order transactions.
const STAmount & saFee, // Transaction fee.
uint32 uSourceTag); // User call back value.
bool sign (const RippleAddress& naAccountPrivate);
bool sign (const RippleAddress & naAccountPrivate);
bool checkSign() const;
void updateID() { mTransactionID=mTransaction->getTransactionID(); }
bool checkSign () const;
SerializedTransaction::ref getSTransaction() { return mTransaction; }
void updateID ()
{
mTransactionID = mTransaction->getTransactionID ();
}
SerializedTransaction::ref getSTransaction ()
{
return mTransaction;
}
uint256 const& getID () const
{
return mTransactionID;
}
const RippleAddress& getFromAccount () const
{
return mAccountFrom;
}
STAmount getAmount () const
{
return mTransaction->getFieldU64 (sfAmount);
}
STAmount getFee () const
{
return mTransaction->getTransactionFee ();
}
uint32 getFromAccountSeq () const
{
return mTransaction->getSequence ();
}
uint32 getSourceTag () const
{
return mTransaction->getFieldU32 (sfSourceTag);
}
uint256 const& getID() const { return mTransactionID; }
const RippleAddress& getFromAccount() const { return mAccountFrom; }
STAmount getAmount() const { return mTransaction->getFieldU64(sfAmount); }
STAmount getFee() const { return mTransaction->getTransactionFee(); }
uint32 getFromAccountSeq() const { return mTransaction->getSequence(); }
uint32 getSourceTag() const { return mTransaction->getFieldU32(sfSourceTag); }
// VFALCO TODO Should this return a const reference?
Blob getSignature() const { return mTransaction->getSignature(); }
LedgerIndex getLedger() const { return mInLedger; }
TransStatus getStatus() const { return mStatus; }
Blob getSignature () const
{
return mTransaction->getSignature ();
}
TER getResult() { return mResult; }
void setResult(TER terResult) { mResult = terResult; }
LedgerIndex getLedger () const
{
return mInLedger;
}
void setStatus(TransStatus status, uint32 ledgerSeq);
void setStatus(TransStatus status) { mStatus=status; }
void setLedger(LedgerIndex ledger) { mInLedger = ledger; }
TransStatus getStatus () const
{
return mStatus;
}
// database functions
void save();
bool operator<(const Transaction&) const;
bool operator>(const Transaction&) const;
bool operator==(const Transaction&) const;
bool operator!=(const Transaction&) const;
bool operator<=(const Transaction&) const;
bool operator>=(const Transaction&) const;
TER getResult ()
{
return mResult;
}
Json::Value getJson(int options, bool binary = false) const;
void setResult (TER terResult)
{
mResult = terResult;
}
static Transaction::pointer load(uint256 const& id);
void setStatus (TransStatus status, uint32 ledgerSeq);
// conversion function
static bool convertToTransactions(uint32 ourLedgerSeq, uint32 otherLedgerSeq,
bool checkFirstTransactions, bool checkSecondTransactions, const SHAMap::Delta& inMap,
std::map<uint256, std::pair<Transaction::pointer, Transaction::pointer> >& outMap);
void setStatus (TransStatus status)
{
mStatus = status;
}
static bool isHexTxID(const std::string&);
void setLedger (LedgerIndex ledger)
{
mInLedger = ledger;
}
// database functions
void save ();
bool operator< (const Transaction&) const;
bool operator> (const Transaction&) const;
bool operator== (const Transaction&) const;
bool operator!= (const Transaction&) const;
bool operator<= (const Transaction&) const;
bool operator>= (const Transaction&) const;
Json::Value getJson (int options, bool binary = false) const;
static Transaction::pointer load (uint256 const & id);
// conversion function
static bool convertToTransactions (uint32 ourLedgerSeq, uint32 otherLedgerSeq,
bool checkFirstTransactions, bool checkSecondTransactions, const SHAMap::Delta & inMap,
std::map<uint256, std::pair<Transaction::pointer, Transaction::pointer> >& outMap);
static bool isHexTxID (const std::string&);
protected:
static Transaction::pointer transactionFromSQL(const std::string& statement);
static Transaction::pointer transactionFromSQL (const std::string & statement);
private:
uint256 mTransactionID;
RippleAddress mAccountFrom;
RippleAddress mFromPubKey; // Sign transaction with this. mSignPubKey
RippleAddress mSourcePrivate; // Sign transaction with this.
uint256 mTransactionID;
RippleAddress mAccountFrom;
RippleAddress mFromPubKey; // Sign transaction with this. mSignPubKey
RippleAddress mSourcePrivate; // Sign transaction with this.
LedgerIndex mInLedger;
TransStatus mStatus;
TER mResult;
LedgerIndex mInLedger;
TransStatus mStatus;
TER mResult;
SerializedTransaction::pointer mTransaction;
SerializedTransaction::pointer mTransaction;
};
#endif