highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-29 09:55:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change brace formatting

Browse Source 
Suggested https://github.com/bitcoin/bitcoin/pull/15288#pullrequestreview-197915100
This commit is contained in:
Russell Yanofsky
2019-02-01 17:35:51 -05:00
parent a1df1b48a8
commit f7efd87c8f
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wallet/wallet.cpp
View File

@@ -2073,8 +2073,9 @@ bool CWalletTx::InMempool() const
bool CWalletTx::IsTrusted(interfaces::Chain::Lock& locked_chain) const
{
// Quick answer in most cases
if (!locked_chain.checkFinalTx(*tx))
if (!locked_chain.checkFinalTx(*tx)) {
return false;
}
int nDepth = GetDepthInMainChain(locked_chain);
if (nDepth >= 1)
return true;
@@ -2129,8 +2130,9 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(interfaces::Chain::
for (const std::pair<const unsigned int, CWalletTx*>& item : mapSorted)
{
CWalletTx& wtx = *item.second;
if (wtx.RelayWalletTransaction(locked_chain))
if (wtx.RelayWalletTransaction(locked_chain)) {
result.push_back(wtx.GetHash());
}
}
return result;
}
@@ -2319,8 +2321,9 @@ void CWallet::AvailableCoins(interfaces::Chain::Lock& locked_chain, std::vector<
const uint256& wtxid = entry.first;
const CWalletTx* pcoin = &entry.second;
if (!locked_chain.checkFinalTx(*pcoin->tx))
if (!locked_chain.checkFinalTx(*pcoin->tx)) {
continue;
}
if (pcoin->IsImmatureCoinBase(locked_chain))
continue;
@@ -4331,8 +4334,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
//We can't rescan beyond non-pruned blocks, stop and throw an error
//this might happen if a user uses an old wallet within a pruned node
// or if he ran -disablewallet for a longer time, then decided to re-enable
if (chain.getPruneMode())
{
if (chain.getPruneMode()) {
int block_height = *tip_height;
while (block_height > 0 && locked_chain->haveBlockOnDisk(block_height - 1) && rescan_height != block_height) {
--block_height;