mirror of
https://github.com/dashpay/dash.git
synced 2024-12-29 13:59:06 +01:00
Remove excess logic.
This commit is contained in:
parent
813eacf81b
commit
9a763d4f86
@ -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)
|
bool BlockAssembler::SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set &mapModifiedTx, CTxMemPool::setEntries &failedTx)
|
||||||
{
|
{
|
||||||
assert (it != mempool.mapTx.end());
|
assert (it != mempool.mapTx.end());
|
||||||
if (mapModifiedTx.count(it) || inBlock.count(it) || failedTx.count(it))
|
return mapModifiedTx.count(it) || inBlock.count(it) || failedTx.count(it);
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void BlockAssembler::SortForBlock(const CTxMemPool::setEntries& package, CTxMemPool::txiter entry, std::vector<CTxMemPool::txiter>& sortedEntries)
|
void BlockAssembler::SortForBlock(const CTxMemPool::setEntries& package, CTxMemPool::txiter entry, std::vector<CTxMemPool::txiter>& sortedEntries)
|
||||||
|
@ -181,7 +181,5 @@ void BanTableModel::sort(int column, Qt::SortOrder order)
|
|||||||
|
|
||||||
bool BanTableModel::shouldShow()
|
bool BanTableModel::shouldShow()
|
||||||
{
|
{
|
||||||
if (priv->size() > 0)
|
return priv->size() > 0;
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
@ -1330,10 +1330,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
|
|||||||
bool CScriptCheck::operator()() {
|
bool CScriptCheck::operator()() {
|
||||||
const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
|
const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
|
||||||
const CScriptWitness *witness = &ptxTo->vin[nIn].scriptWitness;
|
const CScriptWitness *witness = &ptxTo->vin[nIn].scriptWitness;
|
||||||
if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore, *txdata), &error)) {
|
return VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore, *txdata), &error);
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int GetSpendHeight(const CCoinsViewCache& inputs)
|
int GetSpendHeight(const CCoinsViewCache& inputs)
|
||||||
|
Loading…
Reference in New Issue
Block a user