diff options
| author | MarcoFalke <[email protected]> | 2020-04-10 12:57:28 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2020-04-10 12:57:35 -0400 |
| commit | 99d6a5be8bf132744917b4b2ece7ec5ac41c94d2 (patch) | |
| tree | dba236ece56b1cf9d06d6f1ae5cba4a16a127ab2 /src/interfaces/node.cpp | |
| parent | Merge #16367: Multiprocess build support (diff) | |
| parent | refactor: Use psbt forward declaration (diff) | |
| download | discoin-99d6a5be8bf132744917b4b2ece7ec5ac41c94d2.tar.xz discoin-99d6a5be8bf132744917b4b2ece7ec5ac41c94d2.zip | |
Merge #17999: refactor: Add ChainClient setMockTime, getWallets methods
3ce16ad2f91d1e2edc7e7bdc5a19f72aa8c3e739 refactor: Use psbt forward declaration (Russell Yanofsky)
1dde238f2c21a0cc9bada10a2449cf9c6b2178ad Add ChainClient setMockTime, getWallets methods (Russell Yanofsky)
Pull request description:
This PR is part of the [process separation project](https://github.com/bitcoin/bitcoin/projects/10).
These changes are needed to set mock times, and get wallet interface pointers correctly when
wallet code is running in a different process from node code in #10102
ACKs for top commit:
MarcoFalke:
re-ACK 3ce16ad2f91d1e2edc7e7bdc5a19f72aa8c3e739 🔙
promag:
Code review ACK 3ce16ad2f91d1e2edc7e7bdc5a19f72aa8c3e739.
Tree-SHA512: 6c093bfcd68adf5858a1aade4361cdb7fb015496673504ac7a93d0bd2595215047184551d6fd526baa27782331cd2819ce45c4cf923b205ce93ac29e485b5dd8
Diffstat (limited to 'src/interfaces/node.cpp')
| -rw-r--r-- | src/interfaces/node.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index 905173d20..6e5fdc61b 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -253,8 +253,9 @@ public: std::vector<std::unique_ptr<Wallet>> getWallets() override { std::vector<std::unique_ptr<Wallet>> wallets; - for (const std::shared_ptr<CWallet>& wallet : GetWallets()) { - wallets.emplace_back(MakeWallet(wallet)); + for (auto& client : m_context.chain_clients) { + auto client_wallets = client->getWallets(); + std::move(client_wallets.begin(), client_wallets.end(), std::back_inserter(wallets)); } return wallets; } |