cryptogera/dogecoin
1
0
Fork 0
mirror of https://github.com/dogecoin/dogecoin.git synced 2026-02-21 04:38:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2259 from rnicoll/1.21-node-context

Browse Source 
Add node context to wallet RPC request object
This commit is contained in:
Ross Nicoll 2021-06-12 16:35:29 +01:00 committed by GitHub
commit efaf5335fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/interfaces/wallet.cpp
View File

@ -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

2
src/interfaces/wallet.h
View File

@ -411,7 +411,7 @@ std::unique_ptr<Wallet> MakeWallet(const std::shared_ptr<CWallet>& wallet);
//! Return implementation of ChainClient interface for a wallet client. This
//! function will be undefined in builds where ENABLE_WALLET is false.
std::unique_ptr<WalletClient> MakeWalletClient(Chain& chain, ArgsManager& args);
std::unique_ptr<WalletClient> MakeWalletClient(NodeContext& node, ArgsManager& args);
} // namespace interfaces

5
src/wallet/context.h
View File

@ -5,6 +5,8 @@
#ifndef BITCOIN_WALLET_CONTEXT_H
#define BITCOIN_WALLET_CONTEXT_H
#include <node/context.h>
class ArgsManager;
namespace interfaces {
class Chain;
@ -24,6 +26,9 @@ struct WalletContext {
interfaces::Chain* chain{nullptr};
ArgsManager* args{nullptr};
//! Dogecoin: getauxwork is a wallet RPC but actually needs the NodeContext.
NodeContext* nodeContext{nullptr};
//! Declare default constructor and destructor that are not inline, so code
//! instantiating the WalletContext struct doesn't need to #include class
//! definitions for smart pointer and container members.

2
src/wallet/init.cpp
View File

@ -107,7 +107,7 @@ void WalletInit::Construct(NodeContext& node) const
LogPrintf("Wallet disabled!\n");
return;
}
auto wallet_client = interfaces::MakeWalletClient(*node.chain, args);
auto wallet_client = interfaces::MakeWalletClient(node, args);
node.wallet_client = wallet_client.get();
node.chain_clients.emplace_back(std::move(wallet_client));
}

2
src/wallet/test/init_test_fixture.cpp
View File

@ -10,7 +10,7 @@
InitWalletDirTestingSetup::InitWalletDirTestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)
{
m_wallet_client = MakeWalletClient(*m_chain, *Assert(m_node.args));
m_wallet_client = interfaces::MakeWalletClient(m_node, *Assert(m_node.args));
std::string sep;
sep += fs::path::preferred_separator;

2
src/wallet/test/wallet_test_fixture.h
View File

@ -21,7 +21,7 @@ struct WalletTestingSetup : public TestingSetup {
explicit WalletTestingSetup(const std::string& chainName = CBaseChainParams::MAIN);
std::unique_ptr<interfaces::Chain> m_chain = interfaces::MakeChain(m_node);
std::unique_ptr<interfaces::WalletClient> m_wallet_client = interfaces::MakeWalletClient(*m_chain, *Assert(m_node.args));
std::unique_ptr<interfaces::WalletClient> m_wallet_client = interfaces::MakeWalletClient(m_node, *Assert(m_node.args));
CWallet m_wallet;
std::unique_ptr<interfaces::Handler> m_chain_notifications_handler;
};