Shorten variable names and switch to tx/s

This commit is contained in:
Pieter Wuille
2017-01-04 07:35:39 -08:00
parent 6dd81169fc
commit e356d9a758
3 changed files with 8 additions and 8 deletions

View File

@@ -4150,10 +4150,10 @@ double GuessVerificationProgress(const ChainTxData& data, CBlockIndex *pindex) {
double fTxTotal;
if (pindex->nChainTx <= data.nTransactionsLastCheckpoint) {
fTxTotal = data.nTransactionsLastCheckpoint + (nNow - data.nTimeLastCheckpoint) / 86400.0 * data.fTransactionsPerDay;
if (pindex->nChainTx <= data.nTxCount) {
fTxTotal = data.nTxCount + (nNow - data.nTime) * data.dTxRate;
} else {
fTxTotal = pindex->nChainTx + (nNow - pindex->GetBlockTime()) / 86400.0 * data.fTransactionsPerDay;
fTxTotal = pindex->nChainTx + (nNow - pindex->GetBlockTime()) * data.dTxRate;
}
return pindex->nChainTx / fTxTotal;