working commit

testconnect.cpp

@@ -9,11 +9,11 @@
 #include <memory>
 
 #include <testconnect.hpp>
-#include <nethandler.hpp>
-#include <rpcheader.hpp>
+#include <abrpchandler.hpp>
+#include <msgheader.hpp>
 
 
-TestConnector::TestConnector(NetHandler& hand) {
+TestConnector::TestConnector(AbstractRPCHandler& hand) {
         handler = &hand;
 }
 
@@ -25,7 +25,7 @@ std::expected<int, std::string> TestConnector::Write(std::string reqNetPacket) {
         reqRawHeader.resize(rhSize);
         ss.read(reqRawHeader.data(), rhSize);
         // Decode header
-        RPCHeader reqHeader;
+        MessageHeader reqHeader;
         reqHeader.Decode(reqRawHeader);
         // Read protobuf packet
         std::string reqData;
@@ -37,7 +37,7 @@ std::expected<int, std::string> TestConnector::Write(std::string reqNetPacket) {
         handler->Handle(reqData, resData);
         // Pack result
         std::string resNetPacket;
-        RPCHeader resHeader(resData.size());
+        MessageHeader resHeader(resData.size());
         resNetPacket.append(resHeader.Encode());
         resNetPacket.append(resData);