Refactor Xapi interface

MPogotsky · Oct 21, 2024 · 58ba2a1 · 58ba2a1
1 parent 3d31d80
commit 58ba2a1
Show file tree

Hide file tree

Showing 18 changed files with 863 additions and 936 deletions.
diff --git a/examples/GetBalance.cpp b/examples/GetBalance.cpp
@@ -5,7 +5,7 @@
 #include <boost/json.hpp>
 #include <xapi/Xapi.hpp>
 
-boost::asio::awaitable<void> printBalance(xapi::XClientStream &stream)
+boost::asio::awaitable<void> printBalance(xapi::XStationClientStream &stream)
 {
     co_await stream.getBalance();
     // Use getKeepAlive, to keep the connection alive
@@ -20,8 +20,8 @@ boost::asio::awaitable<void> printBalance(xapi::XClientStream &stream)
         counter += 1;
     }
 
-    co_await stream.stopBalance();
     co_await stream.stopKeepAlive();
+    co_await stream.stopBalance();
 
     co_return;
 }

diff --git a/examples/GetCandles.cpp b/examples/GetCandles.cpp
@@ -6,7 +6,7 @@
 #include <boost/json.hpp>
 #include <xapi/Xapi.hpp>
 
-boost::asio::awaitable<void> printCandles(xapi::XClientStream &stream)
+boost::asio::awaitable<void> printCandles(xapi::XStationClientStream &stream)
 {
     co_await stream.getCandles("US100");
     // Use getKeepAlive, to keep the connection alive

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -3,9 +3,8 @@ enable_testing()
 
 set( SOURCES 
     TestConnection.cpp
-    TestSocket.cpp
-    TestStream.cpp
     TestXStationClient.cpp
+    TestXStationClientStream.cpp
 )
 
 add_executable( tests

diff --git a/test/TestSocket.cpp b/test/TestSocket.cpp