diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -399,7 +399,6 @@ compressor.cpp eventloop.cpp feerate.cpp - globals.cpp core_read.cpp core_write.cpp key.cpp @@ -476,7 +475,6 @@ consensus/tx_check.cpp dbwrapper.cpp flatfile.cpp - globals.cpp httprpc.cpp httpserver.cpp index/base.cpp diff --git a/src/config.cpp b/src/config.cpp --- a/src/config.cpp +++ b/src/config.cpp @@ -6,7 +6,6 @@ #include #include // DEFAULT_MAX_BLOCK_SIZE -#include GlobalConfig::GlobalConfig() : useCashAddr(false), nMaxBlockSize(DEFAULT_MAX_BLOCK_SIZE) {} diff --git a/src/globals.h b/src/globals.h deleted file mode 100644 --- a/src/globals.h +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2017 Amaury SÉCHET -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#ifndef BITCOIN_GLOBALS_H -#define BITCOIN_GLOBALS_H - -#include -#include - -#endif // BITCOIN_GLOBALS_H diff --git a/src/globals.cpp b/src/globals.cpp deleted file mode 100644 --- a/src/globals.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2017 Amaury SÉCHET -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#include - -#include -#include diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh --- a/test/lint/lint-circular-dependencies.sh +++ b/test/lint/lint-circular-dependencies.sh @@ -39,10 +39,7 @@ "script/scriptcache -> validation -> script/scriptcache" "seeder/bitcoin -> seeder/db -> seeder/bitcoin" "chainparams -> protocol -> config -> chainparams" - "config -> globals -> policy/policy -> validation -> config" "core_io -> psbt -> node/transaction -> validation -> core_io" - "config -> globals -> policy/policy -> validation -> key_io -> config" - "config -> globals -> policy/policy -> validation -> protocol -> config" ) EXIT_CODE=0