From 02bbc053100ef99ca0f433b0a8c70961336ae79e Mon Sep 17 00:00:00 2001 From: Jesse Cohen Date: Fri, 8 Jun 2018 14:54:02 -0400 Subject: Rescope g_enable_bip61 to net_processing --- src/init.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 1b5507703..1b1c40e08 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1134,8 +1134,6 @@ bool AppInitParameterInteraction() if (gArgs.GetBoolArg("-peerbloomfilters", DEFAULT_PEERBLOOMFILTERS)) nLocalServices = ServiceFlags(nLocalServices | NODE_BLOOM); - g_enable_bip61 = gArgs.GetBoolArg("-enablebip61", DEFAULT_ENABLE_BIP61); - if (gArgs.GetArg("-rpcserialversion", DEFAULT_RPC_SERIALIZE_VERSION) < 0) return InitError("rpcserialversion must be non-negative."); -- cgit v1.2.3 From 3339ba28e95aaaa355b7d33a69cffca7ab29b3fd Mon Sep 17 00:00:00 2001 From: Jesse Cohen Date: Mon, 9 Jul 2018 15:02:32 -0400 Subject: Make g_enable_bip61 a member variable of PeerLogicValidation --- src/init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 1b1c40e08..6660b6661 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1317,7 +1317,7 @@ bool AppInitMain() g_connman = std::unique_ptr(new CConnman(GetRand(std::numeric_limits::max()), GetRand(std::numeric_limits::max()))); CConnman& connman = *g_connman; - peerLogic.reset(new PeerLogicValidation(&connman, scheduler)); + peerLogic.reset(new PeerLogicValidation(&connman, scheduler, gArgs.GetBoolArg("-enablebip61", DEFAULT_ENABLE_BIP61))); RegisterValidationInterface(peerLogic.get()); // sanitize comments per BIP-0014, format user agent and check total size -- cgit v1.2.3