sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #16380: Remove unused bits from the service flags enum

Browse Source 
fa0d0ff6e1bee60fde63724ae28a51aac5a94d4a Remove unused bits from the service flags enum (MarcoFalke)

Pull request description:

  Remove all bits that have no BIP specification nor can be observed on the active network

ACKs for top commit:
  practicalswift:
    utACK fa0d0ff6e1bee60fde63724ae28a51aac5a94d4a
  LarryRuane:
    utACK fa0d0ff6e1bee60fde63724ae28a51aac5a94d4a
  promag:
    ACK fa0d0ff6e1bee60fde63724ae28a51aac5a94d4a.
  laanwj:
    ACK fa0d0ff6e1bee60fde63724ae28a51aac5a94d4a

Tree-SHA512: 6342017bfd4c2a39c998fbb02497931b11892e1cb60fc13b948b91812f281b605a25a3fdc0d5358dff18da4e82eb4eb4de95c43c7e76ecb331c1c3985443dd21
This commit is contained in:
fanquake 2019-07-16 09:31:40 +08:00 committed by Munkybooty
parent 0feb04ab6f
commit d1894b1710
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/protocol.cpp
View File

@ -334,7 +334,6 @@ static std::string serviceFlagToStr(size_t bit)
case NODE_NETWORK: return "NETWORK"; case NODE_NETWORK: return "NETWORK";
case NODE_GETUTXO: return "GETUTXO"; case NODE_GETUTXO: return "GETUTXO";
case NODE_BLOOM: return "BLOOM"; case NODE_BLOOM: return "BLOOM";
case NODE_XTHIN: return "XTHIN";
case NODE_COMPACT_FILTERS: return "COMPACT_FILTERS"; case NODE_COMPACT_FILTERS: return "COMPACT_FILTERS";
case NODE_NETWORK_LIMITED: return "NETWORK_LIMITED"; case NODE_NETWORK_LIMITED: return "NETWORK_LIMITED";
// Not using default, so we get warned when a case is missing // Not using default, so we get warned when a case is missing

5
src/protocol.h
View File

@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2015 The Bitcoin Core developers // Copyright (c) 2009-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -314,9 +314,6 @@ enum ServiceFlags : uint64_t {
// Dash Core nodes used to support this by default, without advertising this bit, // Dash Core nodes used to support this by default, without advertising this bit,
// but no longer do as of protocol version 70201 (= NO_BLOOM_VERSION) // but no longer do as of protocol version 70201 (= NO_BLOOM_VERSION)
NODE_BLOOM = (1 << 2), NODE_BLOOM = (1 << 2),
// NODE_XTHIN means the node supports Xtreme Thinblocks
// If this is turned off then the node will not service nor make xthin requests
NODE_XTHIN = (1 << 4),
// NODE_COMPACT_FILTERS means the node will service basic block filter requests. // NODE_COMPACT_FILTERS means the node will service basic block filter requests.
// See BIP157 and BIP158 for details on how this is implemented. // See BIP157 and BIP158 for details on how this is implemented.
NODE_COMPACT_FILTERS = (1 << 6), NODE_COMPACT_FILTERS = (1 << 6),

2
src/qt/guiutil.cpp
View File

@ -15,10 +15,10 @@
#include <base58.h> #include <base58.h>
#include <chainparams.h> #include <chainparams.h>
#include <primitives/transaction.h>
#include <interfaces/node.h> #include <interfaces/node.h>
#include <key_io.h> #include <key_io.h>
#include <policy/policy.h> #include <policy/policy.h>
#include <primitives/transaction.h>
#include <protocol.h> #include <protocol.h>
#include <script/script.h> #include <script/script.h>
#include <script/standard.h> #include <script/standard.h>