diff options
author | Russell Yanofsky <russ@yanofsky.org> | 2017-12-05 15:57:12 -0500 |
---|---|---|
committer | Russell Yanofsky <russ@yanofsky.org> | 2020-02-25 05:50:39 -0500 |
commit | 1dde238f2c21a0cc9bada10a2449cf9c6b2178ad (patch) | |
tree | 26269cc1ac164d0ef0ebc442b334ad58fe7a2119 /src/interfaces | |
parent | 31c0006a6cd5ecbabd119eaf9dae6978aa54f150 (diff) | |
download | bitcoin-1dde238f2c21a0cc9bada10a2449cf9c6b2178ad.tar.xz |
Add ChainClient setMockTime, getWallets methods
Needed to set mock times, and get wallet interface pointers correctly when
wallet code is running in a different process from node code.
Diffstat (limited to 'src/interfaces')
-rw-r--r-- | src/interfaces/chain.h | 6 | ||||
-rw-r--r-- | src/interfaces/node.cpp | 5 | ||||
-rw-r--r-- | src/interfaces/wallet.cpp | 9 |
3 files changed, 18 insertions, 2 deletions
diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index 7304f82749..8469667053 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -280,6 +280,12 @@ public: //! Shut down client. virtual void stop() = 0; + + //! Set mock time. + virtual void setMockTime(int64_t time) = 0; + + //! Return interfaces for accessing wallets (if any). + virtual std::vector<std::unique_ptr<Wallet>> getWallets() = 0; }; //! Return implementation of Chain interface. diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index 8a64a9d26a..c3cfc71318 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -251,8 +251,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; } diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index baea71d0bb..bec203b638 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -529,6 +529,15 @@ public: void start(CScheduler& scheduler) override { return StartWallets(scheduler); } void flush() override { return FlushWallets(); } void stop() override { return StopWallets(); } + void setMockTime(int64_t time) override { return SetMockTime(time); } + std::vector<std::unique_ptr<Wallet>> getWallets() override + { + std::vector<std::unique_ptr<Wallet>> wallets; + for (const auto& wallet : GetWallets()) { + wallets.emplace_back(MakeWallet(wallet)); + } + return wallets; + } ~WalletClientImpl() override { UnloadWallets(); } Chain& m_chain; |