ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 14:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Back out some Ledger::ref uses that scare me.

Browse Source
This commit is contained in:
JoelKatz
2013-03-10 16:03:23 -07:00
parent 6cacfe8aaf
commit 6f811f1e96
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpp/ripple/LedgerMaster.cpp
View File

@@ -23,7 +23,7 @@ void LedgerMaster::addHeldTransaction(Transaction::ref transaction)
mHeldTransactions.push_back(transaction->getSTransaction()); mHeldTransactions.push_back(transaction->getSTransaction());
} }
void LedgerMaster::pushLedger(Ledger::ref newLedger) void LedgerMaster::pushLedger(Ledger::pointer newLedger)
{ {
// Caller should already have properly assembled this ledger into "ready-to-close" form -- // Caller should already have properly assembled this ledger into "ready-to-close" form --
// all candidate transactions must already be applied // all candidate transactions must already be applied
@@ -41,7 +41,7 @@ void LedgerMaster::pushLedger(Ledger::ref newLedger)
mEngine.setLedger(newLedger); mEngine.setLedger(newLedger);
} }
void LedgerMaster::pushLedger(Ledger::ref newLCL, Ledger::ref newOL, bool fromConsensus) void LedgerMaster::pushLedger(Ledger::pointer newLCL, Ledger::pointer newOL, bool fromConsensus)
{ {
assert(newLCL->isClosed() && newLCL->isAccepted()); assert(newLCL->isClosed() && newLCL->isAccepted());
assert(!newOL->isClosed() && !newOL->isAccepted()); assert(!newOL->isClosed() && !newOL->isAccepted());
@@ -63,7 +63,7 @@ void LedgerMaster::pushLedger(Ledger::ref newLCL, Ledger::ref newOL, bool fromCo
checkAccept(newLCL->getHash(), newLCL->getLedgerSeq()); checkAccept(newLCL->getHash(), newLCL->getLedgerSeq());
} }
void LedgerMaster::switchLedgers(Ledger::ref lastClosed, Ledger::ref current) void LedgerMaster::switchLedgers(Ledger::pointer lastClosed, Ledger::pointer current)
{ {
assert(lastClosed && current); assert(lastClosed && current);
@@ -80,7 +80,7 @@ void LedgerMaster::switchLedgers(Ledger::ref lastClosed, Ledger::ref current)
checkAccept(lastClosed->getHash(), lastClosed->getLedgerSeq()); checkAccept(lastClosed->getHash(), lastClosed->getLedgerSeq());
} }
void LedgerMaster::storeLedger(Ledger::ref ledger) void LedgerMaster::storeLedger(Ledger::pointer ledger)
{ {
mLedgerHistory.addLedger(ledger); mLedgerHistory.addLedger(ledger);
if (ledger->isAccepted()) if (ledger->isAccepted())

8
src/cpp/ripple/LedgerMaster.h
View File

@@ -80,13 +80,13 @@ public:
int getMinValidations() { return mMinValidations; } int getMinValidations() { return mMinValidations; }
void setMinValidations(int v) { mMinValidations = v; } void setMinValidations(int v) { mMinValidations = v; }
void pushLedger(Ledger::ref newLedger); void pushLedger(Ledger::pointer newLedger);
void pushLedger(Ledger::ref newLCL, Ledger::ref newOL, bool fromConsensus); void pushLedger(Ledger::pointer newLCL, Ledger::pointer newOL, bool fromConsensus);
void storeLedger(Ledger::ref); void storeLedger(Ledger::pointer);
void setFullLedger(Ledger::ref ledger); void setFullLedger(Ledger::ref ledger);
void switchLedgers(Ledger::ref lastClosed, Ledger::ref newCurrent); void switchLedgers(Ledger::pointer lastClosed, Ledger::pointer newCurrent);
std::string getCompleteLedgers() std::string getCompleteLedgers()
{ {

4
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -102,7 +102,7 @@ void NetworkOPs::closeTimeOffset(int offset)
uint32 NetworkOPs::getLedgerID(const uint256& hash) uint32 NetworkOPs::getLedgerID(const uint256& hash)
{ {
Ledger::ref lrLedger = mLedgerMaster->getLedgerByHash(hash); Ledger::pointer lrLedger = mLedgerMaster->getLedgerByHash(hash);
return lrLedger ? lrLedger->getLedgerSeq() : 0; return lrLedger ? lrLedger->getLedgerSeq() : 0;
} }
@@ -839,7 +839,7 @@ void NetworkOPs::switchLastClosedLedger(Ledger::pointer newLedger, bool duringCo
theApp->getConnectionPool().relayMessage(NULL, packet); theApp->getConnectionPool().relayMessage(NULL, packet);
} }
int NetworkOPs::beginConsensus(const uint256& networkClosed, Ledger::ref closingLedger) int NetworkOPs::beginConsensus(const uint256& networkClosed, Ledger::pointer closingLedger)
{ {
cLog(lsINFO) << "Consensus time for ledger " << closingLedger->getLedgerSeq(); cLog(lsINFO) << "Consensus time for ledger " << closingLedger->getLedgerSeq();
cLog(lsINFO) << " LCL is " << closingLedger->getParentHash(); cLog(lsINFO) << " LCL is " << closingLedger->getParentHash();

2
src/cpp/ripple/NetworkOPs.h
View File

@@ -263,7 +263,7 @@ public:
void checkState(const boost::system::error_code& result); void checkState(const boost::system::error_code& result);
void switchLastClosedLedger(Ledger::pointer newLedger, bool duringConsensus); // Used for the "jump" case void switchLastClosedLedger(Ledger::pointer newLedger, bool duringConsensus); // Used for the "jump" case
bool checkLastClosedLedger(const std::vector<Peer::pointer>&, uint256& networkClosed); bool checkLastClosedLedger(const std::vector<Peer::pointer>&, uint256& networkClosed);
int beginConsensus(const uint256& networkClosed, Ledger::ref closingLedger); int beginConsensus(const uint256& networkClosed, Ledger::pointer closingLedger);
void tryStartConsensus(); void tryStartConsensus();
void endConsensus(bool correctLCL); void endConsensus(bool correctLCL);
void setStandAlone() { setMode(omFULL); } void setStandAlone() { setMode(omFULL); }

4
src/cpp/ripple/RippleCalc.h
View File

@@ -69,7 +69,7 @@ extern std::size_t hash_value(const aciSource& asValue);
class PathState class PathState
{ {
protected: protected:
Ledger::ref mLedger; Ledger::pointer mLedger;
TER pushNode(const int iType, const uint160& uAccountID, const uint160& uCurrencyID, const uint160& uIssuerID); TER pushNode(const int iType, const uint160& uAccountID, const uint160& uCurrencyID, const uint160& uIssuerID);
TER pushImply(const uint160& uAccountID, const uint160& uCurrencyID, const uint160& uIssuerID); TER pushImply(const uint160& uAccountID, const uint160& uCurrencyID, const uint160& uIssuerID);
@@ -115,7 +115,7 @@ public:
PathState( PathState(
const STAmount& saSend, const STAmount& saSend,
const STAmount& saSendMax, const STAmount& saSendMax,
const Ledger::ref lrLedger = Ledger::pointer() Ledger::pointer lrLedger = Ledger::pointer()
) : mLedger(lrLedger), saInReq(saSendMax), saOutReq(saSend) { ; } ) : mLedger(lrLedger), saInReq(saSendMax), saOutReq(saSend) { ; }
PathState(const PathState& psSrc, bool bUnused) PathState(const PathState& psSrc, bool bUnused)