From 8e5ce2dd4cabd439786ba4b003e6b3d8a6dc3eab Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 8 Jan 2013 14:10:49 -0800 Subject: [PATCH] More debug. --- src/cpp/ripple/Ledger.cpp | 7 +++++++ src/cpp/ripple/LedgerMaster.cpp | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/cpp/ripple/Ledger.cpp b/src/cpp/ripple/Ledger.cpp index 2927ce015..507922666 100644 --- a/src/cpp/ripple/Ledger.cpp +++ b/src/cpp/ripple/Ledger.cpp @@ -955,7 +955,10 @@ uint256 Ledger::getLedgerHash(uint32 ledgerIndex) // easy cases if (ledgerIndex > mLedgerSeq) + { + cLog(lsWARNING) << "Can't get seq " << ledgerIndex << " from " << mLedgerSeq << " future"; return uint256(); + } if (ledgerIndex == mLedgerSeq) return getHash(); @@ -978,7 +981,10 @@ uint256 Ledger::getLedgerHash(uint32 ledgerIndex) } if ((ledgerIndex & 0xff) != 0) + { + cLog(lsWARNING) << "Can't get seq " << ledgerIndex << " from " << mLedgerSeq << " past"; return uint256(); + } // in skiplist SLE::pointer hashIndex = getSLE(getLedgerHashIndex(ledgerIndex)); @@ -994,6 +1000,7 @@ uint256 Ledger::getLedgerHash(uint32 ledgerIndex) return vec.at(vec.size() - sDiff - 1); } + cLog(lsWARNING) << "Can't get seq " << ledgerIndex << " from " << mLedgerSeq << " error"; return uint256(); } diff --git a/src/cpp/ripple/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp index 76c8795d9..71602afaa 100644 --- a/src/cpp/ripple/LedgerMaster.cpp +++ b/src/cpp/ripple/LedgerMaster.cpp @@ -426,7 +426,12 @@ void LedgerMaster::tryPublish() else { hash = mValidLedger->getLedgerHash(seq); - assert(hash.isNonZero()); + if (hash.isZero()) + { + cLog(lsFATAL) << "Ledger: " << mValidLedger->getLedgerSeq() << " does not have hash for " << + seq; + assert(false); + } ledger = mLedgerHistory.getLedgerByHash(hash); }