working commit

service_test.cpp

@@ -8,13 +8,13 @@
 #include <control.pb.h>
 
 #include <rpcclient.hpp>
-#include <nethandler.hpp>
+#include <abrpchandler.hpp>
 #include <service.hpp>
 #include <logger.hpp>
-#include <rpcheader.hpp>
+#include <msgheader.hpp>
 
 
-class TestRPCHandler : public NetHandler {
+class TestRPCHandler : public AbstractRPCHandler {
 public:
         std::expected<void, std::string> Handle(std::string& req, std::string& res) override;
 };
@@ -39,14 +39,14 @@ std::expected<void, std::string>  TestRPCHandler::Handle(std::string& rawReq, st
 
 class TestSocketHandler : public SocketHandler {
 private:
-        NetHandler* nextHandler;
+        AbstractRPCHandler* nextHandler;
 public:
-        TestSocketHandler(NetHandler& rcpHandler);
+        TestSocketHandler(AbstractRPCHandler& rcpHandler);
         virtual void Handle(int sock) override;
         virtual ~TestSocketHandler(void) override;
 };
 
-TestSocketHandler::TestSocketHandler(NetHandler& rpcHandler) {
+TestSocketHandler::TestSocketHandler(AbstractRPCHandler& rpcHandler) {
         nextHandler = &rpcHandler;
 }
 
@@ -66,7 +66,7 @@ void TestSocketHandler::Handle(int sock) {
         }
         logger.Log(std::format("header read size {}", rsize));
 
-        RPCHeader inHeader;
+        MessageHeader inHeader;
         inHeader.Decode(inRawHeader);
         int inPacketSize = inHeader.PacketSize();
         logger.Log(std::format("rpc packet size {}", inPacketSize));
@@ -82,7 +82,7 @@ void TestSocketHandler::Handle(int sock) {
         std::string outRawResult;
         nextHandler->Handle(inRawRequest, outRawResult);
 
-        RPCHeader outHeader(outRawResult.size());
+        MessageHeader outHeader(outRawResult.size());
         auto rawPacket = outHeader.Encode();
         rawPacket.append(outRawResult);