diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2019-06-21 19:58:18 +1200 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2019-06-21 19:59:48 +1200 |
| commit | fd333e15a5454ea7be85702b5eefb3edca1da794 (patch) | |
| tree | 307679d1ed8bcff6ab29e4c3363c1b8b5e4d2eae /src/wallet/wallettool.h | |
| parent | 303ec103bacf2c9498d567210dd77c1305bddf81 (diff) | |
| parent | e61de6306fd89fe9aae90253062e7b1b20343f8a (diff) | |
| download | bitcoin-fd333e15a5454ea7be85702b5eefb3edca1da794.tar.xz | |
Merge #16226: Move ismine to the wallet module
e61de6306fd89fe9aae90253062e7b1b20343f8a Change ismine to take a CWallet instead of CKeyStore (Andrew Chow)
7c611e20007bf5face34d33dffa26c8db67e29ec Move ismine to wallet module (Andrew Chow)
Pull request description:
`IsMine` isn't used outside of the wallet except for the tests. It also doesn't make sense to be outside of the wallet. This PR moves `IsMine` into the wallet module and for it to take a `CWallet` instead of `CKeyStore`. The test that used `IsMine` is also moved to the wallet tests.
This is first [prerequisites](https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Class-Structure-Changes#ismine) for the wallet structure changes.
ACKs for commit e61de6:
MarcoFalke:
re-ACK e61de6306f (only change is rebase with git auto-merge)
meshcollider:
Very light code review ACK https://github.com/bitcoin/bitcoin/pull/16226/commits/e61de6306fd89fe9aae90253062e7b1b20343f8a
Tree-SHA512: 1cb4ad12652aef7922ab7460c6d413e8b9d1855dca78c0a286ae49d5c0765bc7996c55f262c742001d434eb9bd4215dc2cc7aae1b371ee1a82d46b32c17e6341
Diffstat (limited to 'src/wallet/wallettool.h')
| -rw-r--r-- | src/wallet/wallettool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallettool.h b/src/wallet/wallettool.h index da848a747b..7ee2505631 100644 --- a/src/wallet/wallettool.h +++ b/src/wallet/wallettool.h @@ -5,7 +5,7 @@ #ifndef BITCOIN_WALLET_WALLETTOOL_H #define BITCOIN_WALLET_WALLETTOOL_H -#include <script/ismine.h> +#include <wallet/ismine.h> #include <wallet/wallet.h> namespace WalletTool { |