Page MenuHomePhabricator
Files F13115409

D7992.diff
No OneTemporary
Actions

D7992.diff
View Options

diff --git a/src/init.cpp b/src/init.cpp
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2134,7 +2134,6 @@
for (const auto &client : node.chain_clients) {
client->registerRpcs();
}
- g_rpc_node = &node;
#if ENABLE_ZMQ
RegisterZMQRPCCommands(tableRPC);
#endif
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -50,11 +50,6 @@
const CBlockIndex *blockindex)
LOCKS_EXCLUDED(cs_main);
-//! Pointer to node state that needs to be declared as a global to be accessible
-//! RPC methods. Due to limitations of the RPC framework, there's currently no
-//! direct way to pass in state to RPC methods without globals.
-extern NodeContext *g_rpc_node;
-
NodeContext &EnsureNodeContext(const util::Ref &context);
CTxMemPool &EnsureMemPool(const util::Ref &context);
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -2835,5 +2835,3 @@
t.appendCommand(commands[vcidx].name, &commands[vcidx]);
}
}
-
-NodeContext *g_rpc_node = nullptr;
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -117,13 +117,11 @@
TestingSetup::TestingSetup(const std::string &chainName)
: BasicTestingSetup(chainName) {
const Config &config = GetConfig();
- g_rpc_node = &m_node;
const CChainParams &chainparams = config.GetChainParams();
// Ideally we'd move all the RPC tests to the functional testing framework
// instead of unit tests, but for now we need these here.
RPCServer rpcServer;
- g_rpc_node = &m_node;
RegisterAllRPCCommands(config, rpcServer, tableRPC);
/**
@@ -183,7 +181,6 @@
threadGroup.join_all();
GetMainSignals().FlushBackgroundCallbacks();
GetMainSignals().UnregisterBackgroundSignalScheduler();
- g_rpc_node = nullptr;
m_node.connman.reset();
m_node.banman.reset();
m_node.mempool = nullptr;

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:03 (15 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187470
Default Alt Text
D7992.diff (2 KB)

Event Timeline