Merge pull request #779 from evoskuil/master

Make common #includes implicit (from define.hpp).

Author: evoskuil

console/executor.cpp

@@ -21,9 +21,7 @@
 
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
-#include <iostream>
 #include <mutex>
 #include <boost/format.hpp>
 #include <bitcoin/node.hpp>

console/executor.hpp

@@ -21,7 +21,6 @@
 
 #include <atomic>
 #include <future>
-#include <iostream>
 #include <unordered_map>
 #include <bitcoin/database.hpp>
 #include <bitcoin/node.hpp>

console/executor_commands.cpp

@@ -19,7 +19,6 @@
 #include "executor.hpp"
 #include "localize.hpp"
 
-#include <iostream>
 #include <boost/format.hpp>
 #include <bitcoin/node.hpp>
 

console/executor_events.cpp

@@ -18,8 +18,6 @@
  */
 #include "executor.hpp"
 
-#include <iostream>
-#include <string>
 #include <unordered_map>
 #include <bitcoin/node.hpp>
 

console/executor_options.cpp

@@ -19,7 +19,6 @@
 #include "executor.hpp"
 #include "localize.hpp"
 
-#include <string>
 #include <unordered_map>
 #include <boost/format.hpp>
 #include <bitcoin/node.hpp>

console/executor_test_reader.cpp

@@ -20,7 +20,6 @@
 #include "localize.hpp"
 
 ////#include <set>
-////#include <string>
 #include <boost/format.hpp>
 #include <bitcoin/node.hpp>
 

console/main.cpp

@@ -18,7 +18,6 @@
  */
 #include <cstdlib>
 #include <filesystem>
-#include <iostream>
 #include <bitcoin/node.hpp>
 #include "executor.hpp"
 
@@ -32,8 +31,8 @@ namespace system {
     std::ostream& cout = cout_stream();
     std::ostream& cerr = cerr_stream();
     int main(int argc, char* argv[]);
-}
-}
+} // namespace system
+} // namespace libbitcoin
 
 namespace bc = libbitcoin;
 std::filesystem::path symbols_path{};

include/bitcoin/node/configuration.hpp

@@ -27,30 +27,6 @@
 namespace libbitcoin {
 namespace node {
 
-// Not localizable.
-#define BN_HELP_VARIABLE "help"
-#define BN_HARDWARE_VARIABLE "hardware"
-#define BN_SETTINGS_VARIABLE "settings"
-#define BN_VERSION_VARIABLE "version"
-#define BN_NEWSTORE_VARIABLE "newstore"
-#define BN_BACKUP_VARIABLE "backup"
-#define BN_RESTORE_VARIABLE "restore"
-
-#define BN_FLAGS_VARIABLE "flags"
-#define BN_SLABS_VARIABLE "slabs"
-#define BN_BUCKETS_VARIABLE "buckets"
-#define BN_COLLISIONS_VARIABLE "collisions"
-#define BN_INFORMATION_VARIABLE "information"
-
-#define BN_READ_VARIABLE "test"
-#define BN_WRITE_VARIABLE "write"
-
-// This must be lower case but the env var part can be any case.
-#define BN_CONFIG_VARIABLE "config"
-
-// This must match the case of the env var.
-#define BN_ENVIRONMENT_VARIABLE_PREFIX "BN_"
-
 /// Full node configuration, thread safe.
 class BCN_API configuration
 {
@@ -87,8 +63,8 @@ class BCN_API configuration
     /// Settings.
     log::settings log;
     node::settings node;
-    database::settings database;
     network::settings network;
+    database::settings database;
     system::settings bitcoin;
 };
 

include/bitcoin/node/define.hpp

@@ -20,7 +20,6 @@
 #define LIBBITCOIN_NODE_DEFINE_HPP
 
 /// Standard includes (do not include directly).
-#include <functional>
 #include <memory>
 #include <utility>
 #include <variant>

include/bitcoin/node/parser.hpp

@@ -19,11 +19,34 @@
 #ifndef LIBBITCOIN_NODE_PARSER_HPP
 #define LIBBITCOIN_NODE_PARSER_HPP
 
-#include <ostream>
 #include <bitcoin/system.hpp>
 #include <bitcoin/node/configuration.hpp>
 #include <bitcoin/node/define.hpp>
 
+// Not localizable.
+#define BN_HELP_VARIABLE "help"
+#define BN_HARDWARE_VARIABLE "hardware"
+#define BN_SETTINGS_VARIABLE "settings"
+#define BN_VERSION_VARIABLE "version"
+#define BN_NEWSTORE_VARIABLE "newstore"
+#define BN_BACKUP_VARIABLE "backup"
+#define BN_RESTORE_VARIABLE "restore"
+
+#define BN_FLAGS_VARIABLE "flags"
+#define BN_SLABS_VARIABLE "slabs"
+#define BN_BUCKETS_VARIABLE "buckets"
+#define BN_COLLISIONS_VARIABLE "collisions"
+#define BN_INFORMATION_VARIABLE "information"
+
+#define BN_READ_VARIABLE "test"
+#define BN_WRITE_VARIABLE "write"
+
+// This must be lower case but the env var part can be any case.
+#define BN_CONFIG_VARIABLE "config"
+
+// This must match the case of the env var.
+#define BN_ENVIRONMENT_VARIABLE_PREFIX "BN_"
+
 namespace libbitcoin {
 namespace node {