diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-05-02 14:50:25 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-05-02 14:50:30 +0200 |
| commit | f4a6180607a8eecda9167abb2cc3e6e5f3bae6cb (patch) | |
| tree | fd795a3a96d6e7ba68dcf307c9ed48b398208d34 /src | |
| parent | e7b90f78f5546386eb5ed50c4fb9449020517f8b (diff) | |
| parent | 9a763d4f86fb2428bfcae6cad5326600ada10c11 (diff) | |
Merge #10175: Remove excess logic.
9a763d4 Remove excess logic. (practicalswift)
Tree-SHA512: cfef280cc9cccf5042c9c49a8cd6fb6700764671cdd0d988149121f56c2d43a9ac38c5fc99c92385a9619d2d846480e02a9d655fa2586b1c284961b4634c229b
Diffstat (limited to 'src')
| -rw-r--r-- | src/miner.cpp | 4 | ||||
| -rw-r--r-- | src/qt/bantablemodel.cpp | 4 | ||||
| -rw-r--r-- | src/validation.cpp | 5 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 386d75c4be..69a89bd617 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -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) diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp index 4b34e73eb7..f8a99506c1 100644 --- a/src/qt/bantablemodel.cpp +++ b/src/qt/bantablemodel.cpp @@ -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; } diff --git a/src/validation.cpp b/src/validation.cpp index 1030fe1b17..f189b741cd 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1299,10 +1299,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) |