Merge branch 'ripple'

Conflicts:
	src/TransactionEngine.cpp
This commit is contained in:
Arthur Britto
2012-07-17 13:32:29 -07:00
10 changed files with 573 additions and 518 deletions

View File

@@ -269,9 +269,9 @@ Json::Value NetworkOPs::getOwnerInfo(Ledger::pointer lpLedger, const NewcoinAddr
// Ripple functions
//
RippleState::pointer NetworkOPs::getRippleState(const uint256& uLedger, const uint256& uIndex)
RippleState::pointer NetworkOPs::accessRippleState(const uint256& uLedger, const uint256& uIndex)
{
return mLedgerMaster->getLedgerByHash(uLedger)->getRippleState(uIndex);
return mLedgerMaster->getLedgerByHash(uLedger)->accessRippleState(uIndex);
}
//