diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-06-11 09:18:28 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-06-11 09:18:34 +0200 |
| commit | f66eceaecf464bfab5e19f3ca8fe680d8a6aa2e1 (patch) | |
| tree | df73f6f1a6d464dfdcd7dcff559c131b5b1a33ff /src/init/bitcoind.cpp | |
| parent | 6985038046cd72e5d46180995d0263be6f1c42a4 (diff) | |
| parent | 493fb47c577b7564138c883a8f22cbac3619ce44 (diff) | |
| download | bitcoin-f66eceaecf464bfab5e19f3ca8fe680d8a6aa2e1.tar.xz | |
Merge bitcoin/bitcoin#22216: refactor: Make SetupServerArgs callable without NodeContext
493fb47c577b7564138c883a8f22cbac3619ce44 Make SetupServerArgs callable without NodeContext (Russell Yanofsky)
Pull request description:
`bitcoin-gui` code needs to call `SetupServerArgs` but will not have a `NodeContext` object if it is communicating with an external `bitcoin-node` process, so this just passes `ArgsManager` directly.
---
This PR is part of the [process separation project](https://github.com/bitcoin/bitcoin/projects/10). The commit was first part of larger PR #10102.
ACKs for top commit:
MarcoFalke:
review ACK 493fb47c577b7564138c883a8f22cbac3619ce44
Tree-SHA512: 94cda4350113237976e32f1935e3602d1e6ea90c29c4434db2094be70dddf4b63702c3094385258bdf1c3e5b52c7d23bbc1f0282bdd4965557eedd5aef9a0fd4
Diffstat (limited to 'src/init/bitcoind.cpp')
| -rw-r--r-- | src/init/bitcoind.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/init/bitcoind.cpp b/src/init/bitcoind.cpp index 1e17ce4d3c..1d4504c24f 100644 --- a/src/init/bitcoind.cpp +++ b/src/init/bitcoind.cpp @@ -4,6 +4,7 @@ #include <interfaces/init.h> #include <node/context.h> +#include <util/system.h> #include <memory> @@ -14,6 +15,7 @@ class BitcoindInit : public interfaces::Init public: BitcoindInit(NodeContext& node) : m_node(node) { + m_node.args = &gArgs; m_node.init = this; } NodeContext& m_node; |