Sort includes by category using clang-format

.clang-format.base

@@ -35,4 +35,22 @@ BraceWrapping:
   BeforeElse: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
+SortIncludes: true
+IncludeBlocks: Regroup
+IncludeCategories:
+  # Headers in <> without extension.
+  - Regex:           '<([A-Za-z0-9\/-_])+>'
+    Priority:        5
+  # Headers in the boost library.
+  - Regex:           '<boost/.*>'
+    Priority:        4
+  # Headers in other third party libraries
+  - Regex:           '<(gtest|crypto)/([A-Za-z0-9.\/-_])+>'
+    Priority:        3
+  # Headers from nano workspace.
+  - Regex:           '<nano/([A-Za-z0-9.\/-_])+>'
+    Priority:        2
+  # Headers in ""
+  - Regex:           '"([A-Za-z0-9.\/-_])+"'
+    Priority:        1
 ...

nano/core_test/active_transactions.cpp

@@ -1,8 +1,9 @@
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/node/testing.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace std::chrono_literals;
 
 TEST (transaction_counter, validate)

nano/core_test/block.cpp

@@ -1,14 +1,14 @@
-#include <boost/property_tree/json_parser.hpp>
-
-#include <fstream>
-
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
-
 #include <nano/lib/interface.h>
 #include <nano/node/common.hpp>
 #include <nano/node/node.hpp>
 
+#include <gtest/gtest.h>
+
+#include <boost/property_tree/json_parser.hpp>
+
+#include <fstream>
+
 #include <crypto/ed25519-donna/ed25519.h>
 
 TEST (ed25519, signing)

nano/core_test/block_store.cpp

@@ -1,11 +1,12 @@
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/node.hpp>
 #include <nano/secure/versioning.hpp>
 
+#include <gtest/gtest.h>
+
 #include <fstream>
 
 namespace

nano/core_test/conflicts.cpp

@@ -1,7 +1,8 @@
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/node/testing.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace std::chrono_literals;
 
 TEST (conflicts, start_stop)

nano/core_test/difficulty.cpp

@@ -1,7 +1,7 @@
-#include <gtest/gtest.h>
-
 #include <nano/lib/numbers.hpp>
 
+#include <gtest/gtest.h>
+
 TEST (difficulty, multipliers)
 {
 	{

nano/core_test/gap_cache.cpp

@@ -1,7 +1,8 @@
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/node/testing.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace std::chrono_literals;
 
 TEST (gap_cache, add_new)

nano/core_test/interface.cpp

@@ -1,12 +1,12 @@
-#include <gtest/gtest.h>
-
-#include <memory>
-
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/interface.h>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/work.hpp>
 
+#include <gtest/gtest.h>
+
+#include <memory>
+
 TEST (interface, xrb_uint128_to_dec)
 {
 	nano::uint128_union zero (0);

nano/core_test/ipc.cpp

@@ -1,12 +1,15 @@
-#include <boost/property_tree/json_parser.hpp>
-#include <chrono>
-#include <gtest/gtest.h>
-#include <memory>
 #include <nano/core_test/testutil.hpp>
 #include <nano/lib/ipc_client.hpp>
 #include <nano/node/ipc.hpp>
 #include <nano/node/testing.hpp>
 #include <nano/rpc/rpc.hpp>
+
+#include <gtest/gtest.h>
+
+#include <boost/property_tree/json_parser.hpp>
+
+#include <chrono>
+#include <memory>
 #include <sstream>
 #include <vector>
 

nano/core_test/ledger.cpp

@@ -1,10 +1,11 @@
-#include <crypto/cryptopp/filters.h>
-#include <crypto/cryptopp/randpool.h>
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/node/stats.hpp>
 #include <nano/node/testing.hpp>
 
+#include <crypto/cryptopp/filters.h>
+#include <crypto/cryptopp/randpool.h>
+#include <gtest/gtest.h>
+
 using namespace std::chrono_literals;
 
 // Init returns an error if it can't open files at the path

nano/core_test/logger.cpp

@@ -1,9 +1,12 @@
-#include <boost/log/utility/setup/console.hpp>
-#include <chrono>
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/node/logging.hpp>
 #include <nano/secure/utility.hpp>
+
+#include <gtest/gtest.h>
+
+#include <boost/log/utility/setup/console.hpp>
+
+#include <chrono>
 #include <regex>
 
 using namespace std::chrono_literals;

nano/core_test/message.cpp

@@ -1,7 +1,7 @@
-#include <gtest/gtest.h>
-
 #include <nano/node/common.hpp>
 
+#include <gtest/gtest.h>
+
 TEST (message, keepalive_serialization)
 {
 	nano::keepalive request1;

nano/core_test/message_parser.cpp

@@ -1,6 +1,7 @@
-#include <gtest/gtest.h>
 #include <nano/node/testing.hpp>
 
+#include <gtest/gtest.h>
+
 namespace
 {
 class test_visitor : public nano::message_visitor

nano/core_test/network.cpp

@@ -1,10 +1,12 @@
-#include <boost/iostreams/stream_buffer.hpp>
-#include <boost/thread.hpp>
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/node/testing.hpp>
 #include <nano/node/transport/udp.hpp>
 
+#include <gtest/gtest.h>
+
+#include <boost/iostreams/stream_buffer.hpp>
+#include <boost/thread.hpp>
+
 using namespace std::chrono_literals;
 
 TEST (network, tcp_connection)

nano/core_test/node.cpp

@@ -1,14 +1,16 @@
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/node/testing.hpp>
 #include <nano/node/transport/udp.hpp>
 #include <nano/node/working.hpp>
-#include <numeric>
+
+#include <gtest/gtest.h>
 
 #include <boost/make_shared.hpp>
 #include <boost/polymorphic_cast.hpp>
 
+#include <numeric>
+
 using namespace std::chrono_literals;
 
 namespace

nano/core_test/peer_container.cpp

@@ -1,7 +1,8 @@
-#include <gtest/gtest.h>
 #include <nano/node/node.hpp>
 #include <nano/node/testing.hpp>
 
+#include <gtest/gtest.h>
+
 TEST (peer_container, empty_peers)
 {
 	nano::system system (24000, 1);

nano/core_test/processor_service.cpp

@@ -1,7 +1,8 @@
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/node/node.hpp>
 
+#include <gtest/gtest.h>
+
 #include <atomic>
 #include <condition_variable>
 #include <future>

nano/core_test/signing.cpp

@@ -1,7 +1,7 @@
-#include <gtest/gtest.h>
-
 #include <nano/node/node.hpp>
 
+#include <gtest/gtest.h>
+
 TEST (signature_checker, empty)
 {
 	nano::signature_checker checker (0);

nano/core_test/socket.cpp

@@ -1,9 +1,11 @@
-#include <boost/thread.hpp>
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/node/socket.hpp>
 #include <nano/node/testing.hpp>
 
+#include <gtest/gtest.h>
+
+#include <boost/thread.hpp>
+
 using namespace std::chrono_literals;
 
 TEST (socket, concurrent_writes)

nano/core_test/testutil.hpp

@@ -1,13 +1,15 @@
 #pragma once
 
-#include <atomic>
+#include <nano/lib/timer.hpp>
+
 #include <boost/iostreams/concepts.hpp>
 #include <boost/log/sources/logger.hpp>
 #include <boost/log/utility/setup/console.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
+
+#include <atomic>
 #include <condition_variable>
 #include <mutex>
-#include <nano/lib/timer.hpp>
 #include <string>
 
 #define GTEST_TEST_ERROR_CODE(expression, text, actual, expected, fail)                       \

nano/core_test/timer.cpp

@@ -1,7 +1,9 @@
-#include <chrono>
-#include <gtest/gtest.h>
 #include <nano/core_test/testutil.hpp>
 #include <nano/lib/timer.hpp>
+
+#include <gtest/gtest.h>
+
+#include <chrono>
 #include <thread>
 
 /* Tests for the timer utility. Note that we use sleep_for in the tests, which

nano/core_test/uint256_union.cpp

@@ -1,10 +1,10 @@
-#include <gtest/gtest.h>
-
 #include <nano/core_test/testutil.hpp>
 #include <nano/lib/interface.h>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/secure/common.hpp>
 
+#include <gtest/gtest.h>
+
 namespace
 {
 template <typename Union, typename Bound>

nano/core_test/versioning.cpp

@@ -1,8 +1,8 @@
-#include <gtest/gtest.h>
-
 #include <nano/secure/blockstore.hpp>
 #include <nano/secure/versioning.hpp>
 
+#include <gtest/gtest.h>
+
 TEST (versioning, account_info_v1)
 {
 	auto file (nano::unique_path ());

nano/core_test/wallet.cpp

@@ -1,10 +1,11 @@
-#include <gtest/gtest.h>
-
-#include <fstream>
 #include <nano/core_test/testutil.hpp>
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/node/testing.hpp>
 
+#include <gtest/gtest.h>
+
+#include <fstream>
+
 using namespace std::chrono_literals;
 
 TEST (wallet, no_key)

nano/core_test/wallets.cpp

@@ -1,10 +1,10 @@
-#include <gtest/gtest.h>
-
 #include <nano/core_test/testutil.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/testing.hpp>
 #include <nano/secure/versioning.hpp>
 
+#include <gtest/gtest.h>
+
 #include <boost/polymorphic_cast.hpp>
 
 using namespace std::chrono_literals;

nano/core_test/websocket.cpp

@@ -1,19 +1,22 @@
+#include <nano/core_test/testutil.hpp>
+#include <nano/crypto_lib/random_pool.hpp>
+#include <nano/node/testing.hpp>
+#include <nano/node/websocket.hpp>
+
+#include <gtest/gtest.h>
+
 #include <boost/asio.hpp>
 #include <boost/asio/connect.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/beast/core.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/property_tree/json_parser.hpp>
+
 #include <chrono>
 #include <condition_variable>
 #include <cstdlib>
-#include <gtest/gtest.h>
 #include <iostream>
 #include <memory>
-#include <nano/core_test/testutil.hpp>
-#include <nano/crypto_lib/random_pool.hpp>
-#include <nano/node/testing.hpp>
-#include <nano/node/websocket.hpp>
 #include <sstream>
 #include <string>
 #include <vector>

nano/core_test/work_pool.cpp

@@ -1,11 +1,11 @@
-#include <gtest/gtest.h>
-
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/timer.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/wallet.hpp>
 
+#include <gtest/gtest.h>
+
 TEST (work, one)
 {
 	nano::network_constants network_constants;

nano/crypto_lib/interface.cpp

@@ -1,6 +1,7 @@
-#include <crypto/blake2/blake2.h>
 #include <nano/crypto_lib/random_pool.hpp>
 
+#include <crypto/blake2/blake2.h>
+
 extern "C" {
 #include <crypto/ed25519-donna/ed25519-hash-custom.h>
 void ed25519_randombytes_unsafe (void * out, size_t outlen)