diff options
| author | Ross Nicoll <[email protected]> | 2021-06-12 16:35:29 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-12 16:35:29 +0100 |
| commit | efaf5335fde55daae6d5e789e6fb2b1defebf2e7 (patch) | |
| tree | c7b34b633eab188030e7c679e1b6b595ddf75023 /src/interfaces/wallet.cpp | |
| parent | Merge pull request #2248 from rnicoll/1.21-count-type (diff) | |
| parent | Remove separate node and wallet contexts (diff) | |
| download | discoin-efaf5335fde55daae6d5e789e6fb2b1defebf2e7.tar.xz discoin-efaf5335fde55daae6d5e789e6fb2b1defebf2e7.zip | |
Merge pull request #2259 from rnicoll/1.21-node-context
Add node context to wallet RPC request object
Diffstat (limited to 'src/interfaces/wallet.cpp')
| -rw-r--r-- | src/interfaces/wallet.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index f68016b55..4124bc786 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -7,6 +7,7 @@ #include <amount.h> #include <interfaces/chain.h> #include <interfaces/handler.h> +#include <node/context.h> #include <policy/fees.h> #include <primitives/transaction.h> #include <rpc/server.h> @@ -489,8 +490,9 @@ public: class WalletClientImpl : public WalletClient { public: - WalletClientImpl(Chain& chain, ArgsManager& args) + WalletClientImpl(NodeContext& node, Chain& chain, ArgsManager& args) { + m_context.nodeContext = &node; m_context.chain = &chain; m_context.args = &args; } @@ -566,9 +568,9 @@ public: std::unique_ptr<Wallet> MakeWallet(const std::shared_ptr<CWallet>& wallet) { return wallet ? MakeUnique<WalletImpl>(wallet) : nullptr; } -std::unique_ptr<WalletClient> MakeWalletClient(Chain& chain, ArgsManager& args) +std::unique_ptr<WalletClient> MakeWalletClient(NodeContext& node, ArgsManager& args) { - return MakeUnique<WalletClientImpl>(chain, args); + return MakeUnique<WalletClientImpl>(node, *node.chain, args); } } // namespace interfaces |