diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-23 07:58:41 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-23 07:59:02 +0200 |
| commit | 65d7083f152e480b20235a65109ed009e840b18d (patch) | |
| tree | 395fe22dbda70681be9da8dc5fa74c8bd13a533c /src/interfaces | |
| parent | 3e60b9cfa7689bc25ff947da4005cf76b2db2739 (diff) | |
| parent | 3c058fdcc8a71d17296973cb7f09e44a310df22e (diff) | |
| download | bitcoin-65d7083f152e480b20235a65109ed009e840b18d.tar.xz | |
Merge #13017: Add wallets management functions
3c058fd wallet: Add HasWallets (João Barbosa)
373aee2 wallet: Add AddWallet, RemoveWallet, GetWallet and GetWallets (João Barbosa)
6efd964 refactor: Drop CWalletRef typedef (João Barbosa)
Pull request description:
This is a small step towards dynamic wallet load/unload. The wallets *registry* `vpwallets` is used in several places. With these new functions all `vpwallets` usage are removed and `vpwallets` is now a static variable (no external linkage).
The typedef `CWalletRef` is also removed as it is narrowly used.
Tree-SHA512: 2ea19da2e17b521ad678bfe10f3257e497ccaf7ab9fd0b6647f9d829f1d6131cfa68db8e8492421711c6da399859432b963a568bdd4ca40a77dd95b597839423
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index ddd5496a80..e55cba3c65 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -236,7 +236,7 @@ class NodeImpl : public Node { #ifdef ENABLE_WALLET std::vector<std::unique_ptr<Wallet>> wallets; - for (CWalletRef wallet : ::vpwallets) { + for (CWallet* wallet : GetWallets()) { wallets.emplace_back(MakeWallet(*wallet)); } return wallets; |