sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #13691: Remove redundant variables, statements and forward declarations

Browse Source 
3dee4cc509 Remove redundant statement (practicalswift)
99be644966 Remove redundant unused variables (practicalswift)
66ed242343 Remove redundant forward declaration (practicalswift)

Pull request description:

  Remove redundant …
  * ~access modifiers,~
  * forward declarations,
  * unused variables,
  * statements, and
  * ~return types from lambdas.~

Tree-SHA512: 328bb7d9c45398e44ecbee32095b6376879470dfddbc2180e037620d8390d524b51d7fda112fd58a078715e04432b24dd6998a2459f3550aa0498aa68de866d4
This commit is contained in:
MarcoFalke 2018-07-22 09:38:00 -04:00 committed by pasta
parent 7b8eb59178
commit cab82cfe18
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/clientmodel.cpp
View File

@ -28,8 +28,6 @@
#include <QDebug> #include <QDebug>
#include <QTimer> #include <QTimer>
class CBlockIndex;
static int64_t nLastHeaderTipUpdateNotification = 0; static int64_t nLastHeaderTipUpdateNotification = 0;
static int64_t nLastBlockTipUpdateNotification = 0; static int64_t nLastBlockTipUpdateNotification = 0;

2
src/test/miner_tests.cpp
View File

@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
const CChainParams& chainparams = *chainParams; const CChainParams& chainparams = *chainParams;
CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG; CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
std::unique_ptr<CBlockTemplate> pblocktemplate, pemptyblocktemplate; std::unique_ptr<CBlockTemplate> pblocktemplate, pemptyblocktemplate;
CMutableTransaction tx,tx2; CMutableTransaction tx;
CScript script; CScript script;
uint256 hash; uint256 hash;
TestMemPoolEntryHelper entry; TestMemPoolEntryHelper entry;

1
src/txmempool.cpp
View File

@ -1109,7 +1109,6 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
while (!waitingOnDependants.empty()) { while (!waitingOnDependants.empty()) {
const CTxMemPoolEntry* entry = waitingOnDependants.front(); const CTxMemPoolEntry* entry = waitingOnDependants.front();
waitingOnDependants.pop_front(); waitingOnDependants.pop_front();
CValidationState state;
if (!mempoolDuplicate.HaveInputs(entry->GetTx())) { if (!mempoolDuplicate.HaveInputs(entry->GetTx())) {
waitingOnDependants.push_back(entry); waitingOnDependants.push_back(entry);
stepsSinceLastRemove++; stepsSinceLastRemove++;

2
src/wallet/coinselection.cpp
View File

@ -117,7 +117,7 @@ bool SelectCoinsBnB(std::vector<CInputCoin>& utxo_pool, const CAmount& target_va
while (!curr_selection.empty() && !curr_selection.back()) { while (!curr_selection.empty() && !curr_selection.back()) {
curr_selection.pop_back(); curr_selection.pop_back();
curr_available_value += utxo_pool.at(curr_selection.size()).effective_value; curr_available_value += utxo_pool.at(curr_selection.size()).effective_value;
}; }
if (curr_selection.empty()) { // We have walked back to the first utxo and no branch is untraversed. All solutions searched if (curr_selection.empty()) { // We have walked back to the first utxo and no branch is untraversed. All solutions searched
break; break;