mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-26 22:15:52 +00:00
Cleanups.
This commit is contained in:
@@ -7,25 +7,25 @@
|
|||||||
|
|
||||||
SETUP_LOG();
|
SETUP_LOG();
|
||||||
|
|
||||||
AccountItem::AccountItem(SerializedLedgerEntry::pointer ledger) : mLedgerEntry(ledger)
|
AccountItem::AccountItem(SerializedLedgerEntry::ref ledger) : mLedgerEntry(ledger)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AccountItems::AccountItems(uint160& accountID, Ledger::ref ledger, AccountItem::pointer ofType)
|
AccountItems::AccountItems(const uint160& accountID, Ledger::ref ledger, AccountItem::pointer ofType)
|
||||||
{
|
{
|
||||||
mOfType=ofType;
|
mOfType=ofType;
|
||||||
fillItems(accountID, ledger);
|
fillItems(accountID, ledger);
|
||||||
}
|
}
|
||||||
|
|
||||||
// looks in the current ledger
|
// looks in the current ledger
|
||||||
AccountItems::AccountItems(uint160& accountID, AccountItem::pointer ofType )
|
AccountItems::AccountItems(const uint160& accountID, AccountItem::pointer ofType )
|
||||||
{
|
{
|
||||||
mOfType=ofType;
|
mOfType=ofType;
|
||||||
fillItems(accountID,theApp->getLedgerMaster().getClosedLedger());
|
fillItems(accountID,theApp->getLedgerMaster().getClosedLedger());
|
||||||
}
|
}
|
||||||
|
|
||||||
void AccountItems::fillItems(uint160& accountID, Ledger::ref ledger)
|
void AccountItems::fillItems(const uint160& accountID, Ledger::ref ledger)
|
||||||
{
|
{
|
||||||
uint256 rootIndex = Ledger::getOwnerDirIndex(accountID);
|
uint256 rootIndex = Ledger::getOwnerDirIndex(accountID);
|
||||||
uint256 currentIndex = rootIndex;
|
uint256 currentIndex = rootIndex;
|
||||||
|
|||||||
@@ -13,9 +13,11 @@ protected:
|
|||||||
SerializedLedgerEntry::pointer mLedgerEntry;
|
SerializedLedgerEntry::pointer mLedgerEntry;
|
||||||
public:
|
public:
|
||||||
typedef boost::shared_ptr<AccountItem> pointer;
|
typedef boost::shared_ptr<AccountItem> pointer;
|
||||||
|
typedef const pointer& ref;
|
||||||
|
|
||||||
AccountItem(){ }
|
AccountItem(){ }
|
||||||
AccountItem(SerializedLedgerEntry::pointer ledger);
|
AccountItem(SerializedLedgerEntry::ref ledger);
|
||||||
virtual AccountItem::pointer makeItem(uint160& accountID, SerializedLedgerEntry::pointer ledgerEntry)=0;
|
virtual AccountItem::pointer makeItem(const uint160& accountID, SerializedLedgerEntry::ref ledgerEntry)=0;
|
||||||
virtual LedgerEntryType getType()=0;
|
virtual LedgerEntryType getType()=0;
|
||||||
|
|
||||||
SerializedLedgerEntry::pointer getSLE() { return mLedgerEntry; }
|
SerializedLedgerEntry::pointer getSLE() { return mLedgerEntry; }
|
||||||
@@ -30,11 +32,12 @@ class AccountItems
|
|||||||
AccountItem::pointer mOfType;
|
AccountItem::pointer mOfType;
|
||||||
|
|
||||||
std::vector<AccountItem::pointer> mItems;
|
std::vector<AccountItem::pointer> mItems;
|
||||||
void fillItems(uint160& accountID, Ledger::ref ledger);
|
void fillItems(const uint160& accountID, Ledger::ref ledger);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
AccountItems(uint160& accountID, Ledger::ref ledger, AccountItem::pointer ofType);
|
AccountItems(const uint160& accountID, Ledger::ref ledger, AccountItem::pointer ofType);
|
||||||
AccountItems(uint160& accountID, AccountItem::pointer ofType ); // looks in the current ledger
|
AccountItems(const uint160& accountID, AccountItem::pointer ofType ); // looks in the current ledger
|
||||||
|
|
||||||
std::vector<AccountItem::pointer>& getItems() { return(mItems); }
|
std::vector<AccountItem::pointer>& getItems() { return(mItems); }
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#include "Offer.h"
|
#include "Offer.h"
|
||||||
|
|
||||||
AccountItem::pointer Offer::makeItem(uint160& ,SerializedLedgerEntry::pointer ledgerEntry)
|
AccountItem::pointer Offer::makeItem(const uint160& ,SerializedLedgerEntry::ref ledgerEntry)
|
||||||
{
|
{
|
||||||
if (!mLedgerEntry || mLedgerEntry->getType() != ltOFFER) return(AccountItem::pointer());
|
if (!mLedgerEntry || mLedgerEntry->getType() != ltOFFER) return(AccountItem::pointer());
|
||||||
Offer* offer=new Offer(ledgerEntry);
|
Offer* offer=new Offer(ledgerEntry);
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class Offer : public AccountItem
|
|||||||
Offer(SerializedLedgerEntry::pointer ledgerEntry); // For accounts in a ledger
|
Offer(SerializedLedgerEntry::pointer ledgerEntry); // For accounts in a ledger
|
||||||
public:
|
public:
|
||||||
Offer(){}
|
Offer(){}
|
||||||
AccountItem::pointer makeItem(uint160&, SerializedLedgerEntry::pointer ledgerEntry);
|
AccountItem::pointer makeItem(const uint160&, SerializedLedgerEntry::ref ledgerEntry);
|
||||||
LedgerEntryType getType(){ return(ltOFFER); }
|
LedgerEntryType getType(){ return(ltOFFER); }
|
||||||
|
|
||||||
STAmount getTakerPays(){ return(mTakerPays); }
|
STAmount getTakerPays(){ return(mTakerPays); }
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include "RippleState.h"
|
#include "RippleState.h"
|
||||||
|
|
||||||
|
|
||||||
AccountItem::pointer RippleState::makeItem(uint160& accountID, SerializedLedgerEntry::pointer ledgerEntry)
|
AccountItem::pointer RippleState::makeItem(const uint160& accountID, SerializedLedgerEntry::ref ledgerEntry)
|
||||||
{
|
{
|
||||||
if (!mLedgerEntry || mLedgerEntry->getType() != ltRIPPLE_STATE) return(AccountItem::pointer());
|
if (!mLedgerEntry || mLedgerEntry->getType() != ltRIPPLE_STATE) return(AccountItem::pointer());
|
||||||
RippleState* rs=new RippleState(ledgerEntry);
|
RippleState* rs=new RippleState(ledgerEntry);
|
||||||
@@ -10,7 +10,7 @@ AccountItem::pointer RippleState::makeItem(uint160& accountID, SerializedLedgerE
|
|||||||
return(AccountItem::pointer(rs));
|
return(AccountItem::pointer(rs));
|
||||||
}
|
}
|
||||||
|
|
||||||
RippleState::RippleState(SerializedLedgerEntry::pointer ledgerEntry) : AccountItem(ledgerEntry),
|
RippleState::RippleState(SerializedLedgerEntry::ref ledgerEntry) : AccountItem(ledgerEntry),
|
||||||
mValid(false),
|
mValid(false),
|
||||||
mViewLowest(true)
|
mViewLowest(true)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -33,10 +33,10 @@ private:
|
|||||||
bool mValid;
|
bool mValid;
|
||||||
bool mViewLowest;
|
bool mViewLowest;
|
||||||
|
|
||||||
RippleState(SerializedLedgerEntry::pointer ledgerEntry); // For accounts in a ledger
|
RippleState(SerializedLedgerEntry::ref ledgerEntry); // For accounts in a ledger
|
||||||
public:
|
public:
|
||||||
RippleState(){ }
|
RippleState(){ }
|
||||||
AccountItem::pointer makeItem(uint160& accountID, SerializedLedgerEntry::pointer ledgerEntry);
|
AccountItem::pointer makeItem(const uint160& accountID, SerializedLedgerEntry::ref ledgerEntry);
|
||||||
LedgerEntryType getType(){ return(ltRIPPLE_STATE); }
|
LedgerEntryType getType(){ return(ltRIPPLE_STATE); }
|
||||||
|
|
||||||
void setViewAccount(const uint160& accountID);
|
void setViewAccount(const uint160& accountID);
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ class Transaction : public boost::enable_shared_from_this<Transaction>, private
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef boost::shared_ptr<Transaction> pointer;
|
typedef boost::shared_ptr<Transaction> pointer;
|
||||||
|
typedef const pointer& ref;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint256 mTransactionID;
|
uint256 mTransactionID;
|
||||||
@@ -96,7 +97,7 @@ public:
|
|||||||
void setLedger(uint32 ledger) { mInLedger = ledger; }
|
void setLedger(uint32 ledger) { mInLedger = ledger; }
|
||||||
|
|
||||||
// database functions
|
// database functions
|
||||||
static void saveTransaction(const Transaction::pointer&);
|
static void saveTransaction(Transaction::ref);
|
||||||
bool save();
|
bool save();
|
||||||
static Transaction::pointer load(const uint256& id);
|
static Transaction::pointer load(const uint256& id);
|
||||||
static Transaction::pointer findFrom(const RippleAddress& fromID, uint32 seq);
|
static Transaction::pointer findFrom(const RippleAddress& fromID, uint32 seq);
|
||||||
|
|||||||
Reference in New Issue
Block a user