diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-02-05 10:38:10 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-05 10:38:13 -0500 |
| commit | bbdcc0b0ff0ecb4f2bea023f5f08436893547665 (patch) | |
| tree | 9d23fb2a283b2a51e2b034044223fc563af1454a /src/interfaces | |
| parent | e50853501b79378597edbcd6dd217819c057de4b (diff) | |
| parent | aebafd0edf81b546d4b7db9e7f53e9eef2c0073e (diff) | |
| download | bitcoin-bbdcc0b0ff0ecb4f2bea023f5f08436893547665.tar.xz | |
Merge #15342: Suggested wallet code cleanups from #14711
aebafd0edf Rename Chain getLocator -> getTipLocator (Russell Yanofsky)
2c1fbaa771 Drop redundant get_value_or (Russell Yanofsky)
84adb206fc Fix ScanForWalletTransactions start_block comment (Russell Yanofsky)
2efa66b464 Document rescanblockchain returned stop_height being null (Russell Yanofsky)
db2d093233 Add suggested rescanblockchain comments (Russell Yanofsky)
a8d645c934 Update ScanForWalletTransactions result comment (Russell Yanofsky)
95a812b599 Rename ScanResult stop_block field (Russell Yanofsky)
Pull request description:
This implements suggested changes from #14711 review comments that didn't make make it in before merging.
There are no changes in behavior in this PR, just documentation updates, simplifications, and variable renames.
Tree-SHA512: 39f1a5718195732b70b5e427c3b3e4295ea5af6328a5991763a422051212dfb95383186db0c0504ce2c2782fb61998dfd2fe9851645b7cb4e75d849049483cc8
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/chain.cpp | 2 | ||||
| -rw-r--r-- | src/interfaces/chain.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index 38888be8a3..da810bc5e6 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -123,7 +123,7 @@ class LockImpl : public Chain::Lock CBlockIndex* block = LookupBlockIndex(hash); return block && block->GetAncestor(::chainActive.Height()) == ::chainActive.Tip(); } - CBlockLocator getLocator() override { return ::chainActive.GetLocator(); } + CBlockLocator getTipLocator() override { return ::chainActive.GetLocator(); } Optional<int> findLocatorFork(const CBlockLocator& locator) override { LockAnnotation lock(::cs_main); diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index 735d5b60df..3a54b9164e 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -96,7 +96,7 @@ public: virtual bool isPotentialTip(const uint256& hash) = 0; //! Get locator for the current chain tip. - virtual CBlockLocator getLocator() = 0; + virtual CBlockLocator getTipLocator() = 0; //! Return height of the latest block common to locator and chain, which //! is guaranteed to be an ancestor of the block used to create the |