ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pay'

Browse Source 
Conflicts:
	src/NetworkOPs.cpp
	src/SHAMap.cpp
This commit is contained in:
Arthur Britto
2012-06-01 01:23:19 -07:00
parent 46bfa149d1 745806cb29
commit 545ede1823
15 changed files with 95 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NetworkOPs.cpp
View File

@@ -163,11 +163,10 @@ SLE::pointer NetworkOPs::getGenerator(const uint256& uLedger, const uint160& uGe
bool NetworkOPs::getDirInfo(
const uint256& uLedger,
const uint256& uBase,
const LedgerEntryType letKind,
uint256& uDirLineNodeFirst,
uint256& uDirLineNodeLast)
{
uint256 uRootIndex = Ledger::getDirIndex(uBase, letKind);
uint256 uRootIndex = Ledger::getDirIndex(uBase, 0);
LedgerStateParms lspRoot = lepNONE;
SLE::pointer sleRoot = mLedgerMaster->getLedgerByHash(uLedger)->getDirRoot(lspRoot, uRootIndex);
@@ -177,8 +176,9 @@ bool NetworkOPs::getDirInfo(
Log(lsTRACE) << "getDirInfo: first: " << strHex(sleRoot->getIFieldU64(sfFirstNode)) ;
Log(lsTRACE) << "getDirInfo: last: " << strHex(sleRoot->getIFieldU64(sfLastNode)) ;
uDirLineNodeFirst = Ledger::getDirIndex(uBase, letKind, sleRoot->getIFieldU64(sfFirstNode));
uDirLineNodeLast = Ledger::getDirIndex(uBase, letKind, sleRoot->getIFieldU64(sfLastNode));
uDirLineNodeFirst = Ledger::getDirIndex(uBase, sleRoot->getIFieldU64(sfFirstNode));
uDirLineNodeLast = Ledger::getDirIndex(uBase, sleRoot->getIFieldU64(sfLastNode));
Log(lsTRACE) << "getDirInfo: first: " << uDirLineNodeFirst.ToString() ;
Log(lsTRACE) << "getDirInfo: last: " << uDirLineNodeLast.ToString() ;