diff --git a/packages/network/include/network/NetworkInterface.h b/packages/network/include/network/NetworkInterface.h index 64a4ad6d..6f980081 100644 --- a/packages/network/include/network/NetworkInterface.h +++ b/packages/network/include/network/NetworkInterface.h @@ -34,7 +34,7 @@ namespace l::network { bool NetworkStatus(std::string_view interfaceName); template - void CreateRequestTemplate( + void CreateRequest( std::string_view interfaceName, std::string_view queryName, std::string_view endpointString, @@ -55,12 +55,12 @@ namespace l::network { return chandler(success, args, request); }; for (int i = 0; i < numMaxParallellRequestConnections; i++) { - network->CreateRequestTemplate(std::make_unique>(queryName, "", defaultResponseSize, handlerWrapped, timeout)); + network->CreateRequest(std::make_unique>(queryName, "", defaultResponseSize, handlerWrapped, timeout)); } } else { for (int i = 0; i < numMaxParallellRequestConnections; i++) { - network->CreateRequestTemplate(std::make_unique>(queryName, "", defaultResponseSize, nullptr, timeout)); + network->CreateRequest(std::make_unique>(queryName, "", defaultResponseSize, nullptr, timeout)); } } } diff --git a/packages/network/include/network/NetworkInterfaceWS.h b/packages/network/include/network/NetworkInterfaceWS.h index ba494320..06bbdc07 100644 --- a/packages/network/include/network/NetworkInterfaceWS.h +++ b/packages/network/include/network/NetworkInterfaceWS.h @@ -37,19 +37,18 @@ namespace l::network { bool NetworkStatus(std::string_view interfaceName); - template - void CreateWebSocketTemplate( + void CreateWebSocket( std::string_view interfaceName, std::string_view queryName, std::string_view endpointString, - std::function&)> handler = nullptr + std::function handler = nullptr ) { auto network = mNetworkManager.lock(); if (network) { auto it = mInterfaces.find(interfaceName.data()); if (it != mInterfaces.end()) { it->second.AddEndpoint(queryName, endpointString); - network->CreateRequestTemplate(std::make_unique>(queryName, "", 0, handler)); + network->CreateRequest(std::make_unique(queryName, "", 0, handler)); } } } diff --git a/packages/network/include/network/NetworkManager.h b/packages/network/include/network/NetworkManager.h index f1bb919f..196f199f 100644 --- a/packages/network/include/network/NetworkManager.h +++ b/packages/network/include/network/NetworkManager.h @@ -38,7 +38,7 @@ namespace l::network { int32_t CompletedRequestCount(); void ToggleVerboseLogging(); - bool CreateRequestTemplate(std::unique_ptr request); + bool CreateRequest(std::unique_ptr request); bool PostQuery(std::string_view queryName, std::string_view queryArguments, int32_t maxTries = 3, diff --git a/packages/network/source/common/NetworkInterface.cpp b/packages/network/source/common/NetworkInterface.cpp index 44f398a9..e7e96b13 100644 --- a/packages/network/source/common/NetworkInterface.cpp +++ b/packages/network/source/common/NetworkInterface.cpp @@ -28,7 +28,7 @@ namespace l::network { std::string queryName = interfaceName.data(); queryName += "Ping"; - CreateRequestTemplate(interfaceName, queryName, "", 1, 5000, 3, pingHandler); + CreateRequest(interfaceName, queryName, "", 1, 5000, 3, pingHandler); } } diff --git a/packages/network/source/common/NetworkManager.cpp b/packages/network/source/common/NetworkManager.cpp index 3428dea7..9c2d9b10 100644 --- a/packages/network/source/common/NetworkManager.cpp +++ b/packages/network/source/common/NetworkManager.cpp @@ -118,7 +118,7 @@ namespace l::network { mJobManager->gDebugLogging = !mJobManager->gDebugLogging; } - bool NetworkManager::CreateRequestTemplate(std::unique_ptr request) { + bool NetworkManager::CreateRequest(std::unique_ptr request) { std::lock_guard lock(mConnectionsMutex); mConnections.emplace_back(std::move(request)); return true; diff --git a/packages/network/tests/common/NetworkInterfaceTest.cpp b/packages/network/tests/common/NetworkInterfaceTest.cpp index d3d65d2f..f3ea0961 100644 --- a/packages/network/tests/common/NetworkInterfaceTest.cpp +++ b/packages/network/tests/common/NetworkInterfaceTest.cpp @@ -45,7 +45,7 @@ TEST(NetworkInterface, Setup) { }; networkInterface->CreateInterface("Telegram", "https", "api.telegram.org"); - networkInterface->CreateRequestTemplate("Telegram", "TradeFlowBot1", query, 1, 2000, 5, telegramHandler); + networkInterface->CreateRequest("Telegram", "TradeFlowBot1", query, 1, 2000, 5, telegramHandler); std::string args; std::string message = "NetworkInterface tester app"; diff --git a/packages/network/tests/common/NetworkManagerTest.cpp b/packages/network/tests/common/NetworkManagerTest.cpp index adc137f7..328fd23e 100644 --- a/packages/network/tests/common/NetworkManagerTest.cpp +++ b/packages/network/tests/common/NetworkManagerTest.cpp @@ -40,8 +40,8 @@ TEST(NetworkManager, Setup) { } ); - networkManager->CreateRequestTemplate(std::move(request1)); - networkManager->CreateRequestTemplate(std::move(request2)); + networkManager->CreateRequest(std::move(request1)); + networkManager->CreateRequest(std::move(request2)); networkManager->PostQuery("requestName", "user defined query id"); networkManager->PostQuery("requestName", "custom queries on predefined requests", 3, "https://httpbin.org/anything"); @@ -71,7 +71,7 @@ TEST(NetworkManager, Setup) { return l::concurrency::RunnableResult::SUCCESS; } ); - networkManager->CreateRequestTemplate(std::move(request3)); + networkManager->CreateRequest(std::move(request3)); networkManager->PostQuery("TelegramBot", args, 3); TEST_TRUE(networkManager->TotalRequestCount() == 3, ""); } diff --git a/packages/network/tests/common/NetworkWebSocketTest.cpp b/packages/network/tests/common/NetworkWebSocketTest.cpp index ca5182f6..ca354dc2 100644 --- a/packages/network/tests/common/NetworkWebSocketTest.cpp +++ b/packages/network/tests/common/NetworkWebSocketTest.cpp @@ -27,7 +27,7 @@ TEST(NetworkWebSocket, Setup) { }; networkInterfaceWS->CreateInterface("Websocket", "wss", "echo.websocket.org"); - networkInterfaceWS->CreateWebSocketTemplate("Websocket", "wsstest", "", websocketHandler); + networkInterfaceWS->CreateWebSocket("Websocket", "wsstest", "", websocketHandler); networkInterfaceWS->Connect("Websocket", "wsstest"); char buffer[1024]; @@ -73,7 +73,7 @@ TEST(NetworkWebSocket, Binance) { networkInterfaceWS->CreateInterface("Binance", "wss", "testnet.binance.vision"); //networkInterfaceWS->CreateInterface("Binance", "wss", "stream.binance.com", 443); - networkInterfaceWS->CreateWebSocketTemplate("Binance", "binance", "ws", websocketHandler); + networkInterfaceWS->CreateWebSocket("Binance", "binance", "ws", websocketHandler); networkInterfaceWS->Connect("Binance", "binance"); char buffer[1024];