mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-07 22:24:34 +01:00
scripted-diff: Rename InitInterfaces to NodeContext
-BEGIN VERIFY SCRIPT-
s() { git grep -l "$1" src | xargs sed -i "s/$1/$2/g"; }
s 'struct InitInterfaces' 'struct NodeContext'
s 'InitInterfaces interfaces' 'NodeContext node'
s 'InitInterfaces& interfaces' 'NodeContext\& node'
s 'InitInterfaces m_interfaces' 'NodeContext m_context'
s 'InitInterfaces\* g_rpc_interfaces' 'NodeContext* g_rpc_node'
s 'g_rpc_interfaces = &interfaces' 'g_rpc_node = \&node'
s 'g_rpc_interfaces' 'g_rpc_node'
s 'm_interfaces' 'm_context'
s 'interfaces\.chain' 'node.chain'
s '\(AppInitMain\|Shutdown\|Construct\)(interfaces)' '\1(node)'
s 'init interfaces' 'chain clients'
-END VERIFY SCRIPT-
This commit is contained in:
@@ -39,8 +39,8 @@ static void WaitForShutdown()
|
||||
//
|
||||
static bool AppInit(int argc, char* argv[])
|
||||
{
|
||||
InitInterfaces interfaces;
|
||||
interfaces.chain = interfaces::MakeChain();
|
||||
NodeContext node;
|
||||
node.chain = interfaces::MakeChain();
|
||||
|
||||
bool fRet = false;
|
||||
|
||||
@@ -142,7 +142,7 @@ static bool AppInit(int argc, char* argv[])
|
||||
// If locking the data directory failed, exit immediately
|
||||
return false;
|
||||
}
|
||||
fRet = AppInitMain(interfaces);
|
||||
fRet = AppInitMain(node);
|
||||
}
|
||||
catch (const std::exception& e) {
|
||||
PrintExceptionContinue(&e, "AppInit()");
|
||||
@@ -156,7 +156,7 @@ static bool AppInit(int argc, char* argv[])
|
||||
} else {
|
||||
WaitForShutdown();
|
||||
}
|
||||
Shutdown(interfaces);
|
||||
Shutdown(node);
|
||||
|
||||
return fRet;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user