diff --git a/access-node/access_node/include/insite/tvbMonitor.h b/access-node/access_node/include/insite/tvbMonitor.h index b27e08ceb37de403b304d0cb945e05ab4ad3de90..79e57fd2b85726b5f40da7e32dc87bbcda2b1057 100644 --- a/access-node/access_node/include/insite/tvbMonitor.h +++ b/access-node/access_node/include/insite/tvbMonitor.h @@ -9,11 +9,11 @@ #include <type_traits> #include <utility> #include <vector> -#include "better_params.h" #include "circular_timeseries.h" -#include "params.h" +// #include "params.h" #include "spdlog/fmt/fmt.h" #include "spdlog/spdlog.h" +#include "tl/optional.hpp" namespace insite { diff --git a/access-node/access_node/include/insite/tvb_handler.h b/access-node/access_node/include/insite/tvb_handler.h index 48ba9369abe323a23d805af30b65fd885346e8db..04d1b3efb6b3a99d0fcd85fae4414b0a621782ec 100644 --- a/access-node/access_node/include/insite/tvb_handler.h +++ b/access-node/access_node/include/insite/tvb_handler.h @@ -1,14 +1,15 @@ #pragma once -#include <spdlog/spdlog.h> -#include <unistd.h> -#include <condition_variable> -#include <cstdint> -#include <mutex> -#include <thread> #include "opcodes.h" #include "rapidjson/stringbuffer.h" #include "rapidjson/writer.h" #include "tvbMonitor.h" +#include "websocket_server.h" +#include <condition_variable> +#include <cstdint> +#include <mutex> +#include <spdlog/spdlog.h> +#include <thread> +#include <unistd.h> namespace insite { class TvbHandler { diff --git a/access-node/access_node/include/insite/tvb_http_endpoints.h b/access-node/access_node/include/insite/tvb_http_endpoints.h index 955b1d194314fd650d7f4215f9722d001f917da9..878d701dc1491ac46cc74b7b900494489c140bf6 100644 --- a/access-node/access_node/include/insite/tvb_http_endpoints.h +++ b/access-node/access_node/include/insite/tvb_http_endpoints.h @@ -1,10 +1,12 @@ #pragma once -#include <better_params.h> #include "crow/app.h" #include "crow/http_response.h" +#include "crow/middlewares/cors.h" +#include "query_params.h" #include "rapidjson/stringbuffer.h" #include "rapidjson/writer.h" #include "tvb_handler.h" +#include "utilityFunctions.h" namespace insite { class TVBHttpEndpoint { diff --git a/access-node/access_node/include/insite/websocket_server.h b/access-node/access_node/include/insite/websocket_server.h index 7ed7d496c068c08f147b8fa0195187553bfe1870..203b6a2824bbfc549b401b184162efba53112246 100644 --- a/access-node/access_node/include/insite/websocket_server.h +++ b/access-node/access_node/include/insite/websocket_server.h @@ -1,15 +1,14 @@ #pragma once -#include <chrono> -#include <cstdint> -#include <thread> -#include <websocketpp/config/asio_no_tls.hpp> -#include <websocketpp/server.hpp> #include "resource_flags.h" #include "spdlog/spdlog.h" -#include "tvb_handler.h" #include "websocket_sender.h" #include "websocketpp/close.hpp" #include "websocketpp/common/connection_hdl.hpp" +#include <chrono> +#include <cstdint> +#include <thread> +#include <websocketpp/config/asio_no_tls.hpp> +#include <websocketpp/server.hpp> using namespace std::chrono_literals; namespace insite { diff --git a/access-node/access_node/nest/nestVersion.cpp b/access-node/access_node/nest/nestVersion.cpp index 40d3196dba246815db0c68d69167f427c1fb5c66..b3051fd5de47a2f117f97e3c94250e391906bf0a 100644 --- a/access-node/access_node/nest/nestVersion.cpp +++ b/access-node/access_node/nest/nestVersion.cpp @@ -1,14 +1,14 @@ +#include "rapidjson/document.h" +#include "rapidjson/stringbuffer.h" #include <config.h> -#include <nest/nestVersion.h> -#include <spdlog/spdlog.h> -#include <utilityFunctions.h> #include <fstream> #include <iterator> +#include <nest/nestVersion.h> #include <optional> +#include <spdlog/spdlog.h> #include <unordered_set> +#include <utilityFunctions.h> #include <vector> -#include "rapidjson/document.h" -#include "rapidjson/stringbuffer.h" namespace insite { rapidjson::Value NestGetSimulationTimeInfo( diff --git a/access-node/access_node/tvb_handler.cpp b/access-node/access_node/tvb_handler.cpp index 408a0092e66382ef03fae18c75728ece29346eee..5dc6aa6f42fb6a5da3e3749263faff40a46db4b6 100644 --- a/access-node/access_node/tvb_handler.cpp +++ b/access-node/access_node/tvb_handler.cpp @@ -1,10 +1,10 @@ #include "tvb_handler.h" -#include <spdlog/fmt/bin_to_hex.h> -#include <spdlog/fmt/ranges.h> -#include <chrono> -#include <cstdint> #include "opcodes.h" #include "spdlog/spdlog.h" +#include <chrono> +#include <cstdint> +#include <spdlog/fmt/bin_to_hex.h> +#include <spdlog/fmt/ranges.h> using namespace std::chrono_literals; namespace insite { diff --git a/access-node/access_node/websocket_server.cpp b/access-node/access_node/websocket_server.cpp index 9b38fb1042f9459626e3a634d7584335e68f7f73..0628b403105fdf2c821d63718e5aca80f1a24f8a 100644 --- a/access-node/access_node/websocket_server.cpp +++ b/access-node/access_node/websocket_server.cpp @@ -1,8 +1,9 @@ #include "websocket_server.h" -#include <cstdint> #include "nest_handler.h" #include "spdlog/spdlog.h" +#include "tvb_handler.h" #include "websocketpp/frame.hpp" +#include <cstdint> namespace insite {