aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet.h
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2019-01-31 17:42:56 -0500
committerRussell Yanofsky <russ@yanofsky.org>2019-02-01 13:05:30 -0500
commit95a812b5993afe69bfe0fd796428b98ab6282e66 (patch)
tree4ca5e35ee4db9e94b14745e86fc08efe20aa9897 /src/wallet/wallet.h
parent2c0867a1811bd7120aa66d98723ae96b065a3c1b (diff)
downloadbitcoin-95a812b5993afe69bfe0fd796428b98ab6282e66.tar.xz
Rename ScanResult stop_block field
Avoid confusion with stop_block argument as suggested https://github.com/bitcoin/bitcoin/pull/14711#discussion_r252038449
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r--src/wallet/wallet.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 4776b0eacc..cf3fa0aced 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -912,14 +912,14 @@ public:
//! Hash and height of most recent block that was successfully scanned.
//! Unset if no blocks were scanned due to read errors or the chain
//! being empty.
- uint256 stop_block;
- Optional<int> stop_height;
+ uint256 last_scanned_block;
+ Optional<int> last_scanned_height;
//! Height of the most recent block that could not be scanned due to
//! read errors or pruning. Will be set if status is FAILURE, unset if
//! status is SUCCESS, and may or may not be set if status is
//! USER_ABORT.
- uint256 failed_block;
+ uint256 last_failed_block;
};
ScanResult ScanForWalletTransactions(const uint256& first_block, const uint256& last_block, const WalletRescanReserver& reserver, bool fUpdate);
void TransactionRemovedFromMempool(const CTransactionRef &ptx) override;