ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small changes to improve transaction benchmarking:

Browse Source 
* Set transaction valid in hash router correctly
* Properly account for root nodes in walkLedger
* If loaded ledger is insane, log details
* Extra logging while loading replay ledger
* Don't test unsigned transactions expecting them to succeed
* Don't be too noisy about signature failures
This commit is contained in:
JoelKatz
2015-03-26 17:25:41 -07:00
committed by Tom Ritchford
parent b27e152ead
commit b4058a813b
5 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ripple/app/consensus/LedgerConsensus.cpp
View File

@@ -1837,8 +1837,8 @@ int applyTransaction (TransactionEngine& engine
parms = static_cast<TransactionEngineParams> (parms | tapRETRY);
}
if (getApp().getHashRouter ().setFlag (txn->getTransactionID ()
, SF_SIGGOOD))
if ((getApp().getHashRouter ().getFlags (txn->getTransactionID ())
& SF_SIGGOOD) == SF_SIGGOOD)
{
parms = static_cast<TransactionEngineParams>
(parms | tapNO_CHECK_SIGN);

22
src/ripple/app/ledger/Ledger.cpp
View File

@@ -1549,7 +1549,16 @@ bool Ledger::walkLedger () const
std::vector <SHAMapMissingNode> missingNodes1;
std::vector <SHAMapMissingNode> missingNodes2;
if (mAccountStateMap->getHash().isZero() &&
! mAccountHash.isZero() &&
! mAccountStateMap->fetchRoot (mAccountHash, nullptr))
{
missingNodes1.emplace_back (SHAMapType::STATE, mAccountHash);
}
else
{
mAccountStateMap->walkMap (missingNodes1, 32);
}
if (ShouldLog (lsINFO, Ledger) && !missingNodes1.empty ())
{
@@ -1559,7 +1568,16 @@ bool Ledger::walkLedger () const
<< "First: " << missingNodes1[0];
}
if (mTransactionMap->getHash().isZero() &&
mTransHash.isNonZero() &&
! mTransactionMap->fetchRoot (mTransHash, nullptr))
{
missingNodes2.emplace_back (SHAMapType::TRANSACTION, mTransHash);
}
else
{
mTransactionMap->walkMap (missingNodes2, 32);
}
if (ShouldLog (lsINFO, Ledger) && !missingNodes2.empty ())
{
@@ -1584,13 +1602,13 @@ bool Ledger::assertSane () const
return true;
}
WriteLog (lsFATAL, Ledger) << "ledger is not sane";
Json::Value j = getJson (*this);
j [jss::accountTreeHash] = to_string (mAccountHash);
j [jss::transTreeHash] = to_string (mTransHash);
WriteLog (lsFATAL, Ledger) << "ledger is not sane" << j;
assert (false);
return false;

4
src/ripple/app/ledger/tests/Ledger_test.cpp
View File

@@ -132,8 +132,8 @@ public:
test_genesisLedger (true, KeyType::secp256k1);
test_genesisLedger (true, KeyType::ed25519);
test_genesisLedger (false, KeyType::secp256k1);
test_genesisLedger (false, KeyType::ed25519);
// test_genesisLedger (false, KeyType::secp256k1);
// test_genesisLedger (false, KeyType::ed25519);
test_unsigned_fails (KeyType::secp256k1);
test_unsigned_fails (KeyType::ed25519);

5
src/ripple/app/main/Application.cpp
View File

@@ -1238,10 +1238,12 @@ bool ApplicationImp::loadOldLedger (
// this ledger holds the transactions we want to replay
replayLedger = loadLedger;
// this is the prior ledger
m_journal.info << "Loading parent ledger";
loadLedger = Ledger::loadByHash (replayLedger->getParentHash ());
if (!loadLedger)
{
m_journal.info << "Loading parent ledger from node store";
// Try to build the ledger from the back end
auto il = std::make_shared <InboundLedger> (
@@ -1310,6 +1312,7 @@ bool ApplicationImp::loadOldLedger (
txn->getSTransaction()->add(s);
if (!cur->addTransaction(it->getTag(), s))
m_journal.warning << "Unable to add transaction " << it->getTag();
getApp().getHashRouter().setFlag (it->getTag(), SF_SIGGOOD);
}
// Switch to the mutable snapshot

2
src/ripple/app/transactors/Transactor.cpp
View File

@@ -242,7 +242,7 @@ TER Transactor::preCheck ()
(!(mParams & tapNO_CHECK_SIGN) && !mTxn.checkSign()))
{
mTxn.setBad ();
m_journal.warning << "apply: Invalid transaction (bad signature)";
m_journal.debug << "apply: Invalid transaction (bad signature)";
return temINVALID;
}