Browse Source

Remove excess logic.

tags/v0.15.1
practicalswift 4 years ago
parent
commit
9a763d4f86
3 changed files with 3 additions and 10 deletions
  1. 1
    3
      src/miner.cpp
  2. 1
    3
      src/qt/bantablemodel.cpp
  3. 1
    4
      src/validation.cpp

+ 1
- 3
src/miner.cpp View File

@@ -317,9 +317,7 @@ int BlockAssembler::UpdatePackagesForAdded(const CTxMemPool::setEntries& already
bool BlockAssembler::SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set &mapModifiedTx, CTxMemPool::setEntries &failedTx)
{
assert (it != mempool.mapTx.end());
if (mapModifiedTx.count(it) || inBlock.count(it) || failedTx.count(it))
return true;
return false;
return mapModifiedTx.count(it) || inBlock.count(it) || failedTx.count(it);
}

void BlockAssembler::SortForBlock(const CTxMemPool::setEntries& package, CTxMemPool::txiter entry, std::vector<CTxMemPool::txiter>& sortedEntries)

+ 1
- 3
src/qt/bantablemodel.cpp View File

@@ -181,7 +181,5 @@ void BanTableModel::sort(int column, Qt::SortOrder order)

bool BanTableModel::shouldShow()
{
if (priv->size() > 0)
return true;
return false;
return priv->size() > 0;
}

+ 1
- 4
src/validation.cpp View File

@@ -1330,10 +1330,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
bool CScriptCheck::operator()() {
const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
const CScriptWitness *witness = &ptxTo->vin[nIn].scriptWitness;
if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore, *txdata), &error)) {
return false;
}
return true;
return VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore, *txdata), &error);
}

int GetSpendHeight(const CCoinsViewCache& inputs)

Loading…
Cancel
Save