working commit

testconnect_test.cpp

@@ -7,14 +7,14 @@
 #include <sstream>
 
 #include <netclient.hpp>
-#include <nethandler.hpp>
+#include <abrpchandler.hpp>
 #include <testconnect.hpp>
-#include <rpcheader.hpp>
+#include <msgheader.hpp>
 #include <logger.hpp>
 
 #include <control.pb.h>
 
-class TestHandler : public NetHandler {
+class TestHandler : public AbstractRPCHandler {
 public:
         std::expected<void, std::string> Handle(std::string& req, std::string& res) override;
 };
@@ -46,7 +46,7 @@ int main(int argc, char** argv) {
         std::string rawReq;
         pbReq.SerializeToString(&rawReq);
 
-        RPCHeader reqHeader(rawReq.size());
+        MessageHeader reqHeader(rawReq.size());
         auto rawHeader = reqHeader.Encode();
 
         std::string reqPacket;
@@ -60,7 +60,7 @@ int main(int argc, char** argv) {
         const int rhSize = rpcHeaderSize;
         auto rSize = conn.Read(resRawHeader, rhSize);
 
-        RPCHeader resHeader;
+        MessageHeader resHeader;
         resHeader.Decode(resRawHeader);
 
         auto pSize = resHeader.PacketSize();