diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2019-10-29 10:49:48 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2019-10-29 11:30:12 +0200 |
| commit | f44abe4bed25a40145ab168adc1589f5df4146f3 (patch) | |
| tree | aa977707d7b86d74866e0bc1de2d4ecb79c514b5 | |
| parent | 4c1090c882ea15ba4d10a2f7f320f3c0eb490ebd (diff) | |
| download | bitcoin-f44abe4bed25a40145ab168adc1589f5df4146f3.tar.xz | |
refactor: Remove addrdb.h dependency from node.h
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/addrdb.h | 3 | ||||
| -rw-r--r-- | src/banman.h | 1 | ||||
| -rw-r--r-- | src/interfaces/node.h | 2 | ||||
| -rw-r--r-- | src/net_types.h | 15 | ||||
| -rw-r--r-- | src/qt/bantablemodel.cpp | 4 | ||||
| -rw-r--r-- | src/rpc/net.cpp | 3 |
7 files changed, 23 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 82cc19d57c..bfcc1df784 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -152,6 +152,7 @@ BITCOIN_CORE_H = \ net.h \ net_permissions.h \ net_processing.h \ + net_types.h \ netaddress.h \ netbase.h \ netmessagemaker.h \ diff --git a/src/addrdb.h b/src/addrdb.h index 290b63dd12..ad85224d1f 100644 --- a/src/addrdb.h +++ b/src/addrdb.h @@ -7,6 +7,7 @@ #define BITCOIN_ADDRDB_H #include <fs.h> +#include <net_types.h> // For banmap_t #include <serialize.h> #include <string> @@ -79,8 +80,6 @@ public: } }; -typedef std::map<CSubNet, CBanEntry> banmap_t; - /** Access to the (IP) address database (peers.dat) */ class CAddrDB { diff --git a/src/banman.h b/src/banman.h index a1a00309dd..a01190e694 100644 --- a/src/banman.h +++ b/src/banman.h @@ -10,6 +10,7 @@ #include <addrdb.h> #include <fs.h> +#include <net_types.h> // For banmap_t #include <sync.h> // NOTE: When adjusting this, update rpcnet:setban's help ("24h") diff --git a/src/interfaces/node.h b/src/interfaces/node.h index 4ee467014c..06f9e348e3 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -5,9 +5,9 @@ #ifndef BITCOIN_INTERFACES_NODE_H #define BITCOIN_INTERFACES_NODE_H -#include <addrdb.h> // For banmap_t #include <amount.h> // For CAmount #include <net.h> // For CConnman::NumConnections +#include <net_types.h> // For banmap_t #include <netaddress.h> // For Network #include <support/allocators/secure.h> // For SecureString diff --git a/src/net_types.h b/src/net_types.h new file mode 100644 index 0000000000..d55a8cde6c --- /dev/null +++ b/src/net_types.h @@ -0,0 +1,15 @@ +// Copyright (c) 2019 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_NET_TYPES_H +#define BITCOIN_NET_TYPES_H + +#include <map> + +class CBanEntry; +class CSubNet; + +using banmap_t = std::map<CSubNet, CBanEntry>; + +#endif // BITCOIN_NET_TYPES_H diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp index ae11b80347..48201b420e 100644 --- a/src/qt/bantablemodel.cpp +++ b/src/qt/bantablemodel.cpp @@ -4,9 +4,9 @@ #include <qt/bantablemodel.h> -#include <qt/clientmodel.h> - #include <interfaces/node.h> +#include <net_types.h> // For banmap_t +#include <qt/clientmodel.h> #include <algorithm> diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 7b1507e4dc..797b6d0996 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -8,8 +8,9 @@ #include <clientversion.h> #include <core_io.h> #include <net.h> -#include <net_processing.h> #include <net_permissions.h> +#include <net_processing.h> +#include <net_types.h> // For banmap_t #include <netbase.h> #include <policy/settings.h> #include <rpc/protocol.h> |