diff options
| author | Dhruv Mehta <856960+dhruv@users.noreply.github.com> | 2021-02-05 12:17:41 -0800 |
|---|---|---|
| committer | Dhruv Mehta <856960+dhruv@users.noreply.github.com> | 2021-07-07 22:13:01 -0700 |
| commit | 6f8b198b8256a6703a6f5e592dfa77fa024a7035 (patch) | |
| tree | e52bf52b7087a7e1b6467c39af485a0b7aa4ecda /src/init.cpp | |
| parent | eba5b1cd6460c98e75d0422bd394e12af7f11e4c (diff) | |
[p2p] remove unused segwitheight=-1 option
This also lets us default to NODE_WITNESS in nLocalServices
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/init.cpp b/src/init.cpp index ae96f510bc..ee0953ce1f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -716,7 +716,7 @@ namespace { // Variables internal to initialization process only int nMaxConnections; int nUserMaxConnections; int nFD; -ServiceFlags nLocalServices = ServiceFlags(NODE_NETWORK | NODE_NETWORK_LIMITED); +ServiceFlags nLocalServices = ServiceFlags(NODE_NETWORK | NODE_NETWORK_LIMITED | NODE_WITNESS); int64_t peer_connect_timeout; std::set<BlockFilterType> g_enabled_filter_types; @@ -1588,12 +1588,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) } } - if (DeploymentEnabled(chainparams.GetConsensus(), Consensus::DEPLOYMENT_SEGWIT)) { - // Advertise witness capabilities. - // The option to not set NODE_WITNESS is only used in the tests and should be removed. - nLocalServices = ServiceFlags(nLocalServices | NODE_WITNESS); - } - // ********************************************************* Step 11: import blocks if (!CheckDiskSpace(gArgs.GetDataDirNet())) { |