diff --git a/receiver/src/receiver_data_server/rds_net_server.h b/receiver/src/receiver_data_server/rds_net_server.h
index 7465a583869c23fae5000a65302cbb71aa1c2e4b..57dd22a1487f111ad9c470b365c1d5856ac56b1e 100644
--- a/receiver/src/receiver_data_server/rds_net_server.h
+++ b/receiver/src/receiver_data_server/rds_net_server.h
@@ -10,11 +10,10 @@ namespace asapo {
class RdsNetServer {
public:
virtual GenericRequests GetNewRequests(Error* err) const noexcept = 0;
- virtual Error SendResponse(const ReceiverDataServerRequest* request, uint64_t source_id,
+ virtual Error SendResponse(const ReceiverDataServerRequest* request,
const GenericNetworkResponse* response) const noexcept = 0;
virtual Error
- SendResponseAndSlotData(const ReceiverDataServerRequest* request, uint64_t source_id,
- const GenericNetworkResponse* response,
+ SendResponseAndSlotData(const ReceiverDataServerRequest* request, const GenericNetworkResponse* response,
const CacheMeta* cache_slot) const noexcept = 0;
virtual void HandleAfterError(uint64_t source_id) const noexcept = 0;
virtual ~RdsNetServer() = default;
diff --git a/receiver/src/receiver_data_server/receiver_data_server_request_handler.cpp b/receiver/src/receiver_data_server/receiver_data_server_request_handler.cpp
index c064a9772f379e1f78100307a1a63df437f04d17..af648156d8d4e8c1314c6adf81fc07c8dfe2654f 100644
--- a/receiver/src/receiver_data_server/receiver_data_server_request_handler.cpp
+++ b/receiver/src/receiver_data_server/receiver_data_server_request_handler.cpp
@@ -19,7 +19,7 @@ Error ReceiverDataServerRequestHandler::SendResponse(const ReceiverDataServerReq
GenericNetworkResponse response{};
response.op_code = kOpcodeGetBufferData;
response.error_code = code;
- return server_->SendResponse(request, request->source_id, &response);
+ return server_->SendResponse(request, &response);
}
Error ReceiverDataServerRequestHandler::SendResponseAndSlotData(const ReceiverDataServerRequest* request,
@@ -27,7 +27,7 @@ Error ReceiverDataServerRequestHandler::SendResponseAndSlotData(const ReceiverDa
GenericNetworkResponse response{};
response.op_code = kOpcodeGetBufferData;
response.error_code = kNetErrorNoError;
- return server_->SendResponseAndSlotData(request, request->source_id, &response,
+ return server_->SendResponseAndSlotData(request, &response,
meta);
}
diff --git a/receiver/src/receiver_data_server/tcp_server.cpp b/receiver/src/receiver_data_server/tcp_server.cpp
index 6dd04c6368970992bdd23d39299f4f5b0780ddc1..02c4c67a423b83490a5061798d92cd08645c7476 100644
--- a/receiver/src/receiver_data_server/tcp_server.cpp
+++ b/receiver/src/receiver_data_server/tcp_server.cpp
@@ -94,10 +94,10 @@ void TcpServer::HandleAfterError(uint64_t source_id) const noexcept {
CloseSocket(source_id);
}
-Error TcpServer::SendResponse(const ReceiverDataServerRequest* request, uint64_t source_id,
+Error TcpServer::SendResponse(const ReceiverDataServerRequest* request,
const GenericNetworkResponse* response) const noexcept {
Error err;
- io__->Send(source_id, response, sizeof(*response), &err);
+ io__->Send(request->source_id, response, sizeof(*response), &err);
if (err) {
log__->Error("cannot send to consumer" + err->Explain());
}
@@ -105,17 +105,16 @@ Error TcpServer::SendResponse(const ReceiverDataServerRequest* request, uint64_t
}
Error
-TcpServer::SendResponseAndSlotData(const ReceiverDataServerRequest* request, uint64_t source_id,
- const GenericNetworkResponse* response,
+TcpServer::SendResponseAndSlotData(const ReceiverDataServerRequest* request, const GenericNetworkResponse* response,
const CacheMeta* cache_slot) const noexcept {
Error err;
- err = SendResponse(nullptr, source_id, response);
+ err = SendResponse(request, response);
if (err) {
return err;
}
- io__->Send(source_id, cache_slot->addr, cache_slot->size, &err);
+ io__->Send(request->source_id, cache_slot->addr, cache_slot->size, &err);
if (err) {
log__->Error("cannot send slot to worker" + err->Explain());
}
diff --git a/receiver/src/receiver_data_server/tcp_server.h b/receiver/src/receiver_data_server/tcp_server.h
index c7caf5eccb87c891bd9bca09c905799ecb6b17bd..9f0f4fe347e5ca16574b694ec85f2cb5ab663933 100644
--- a/receiver/src/receiver_data_server/tcp_server.h
+++ b/receiver/src/receiver_data_server/tcp_server.h
@@ -14,10 +14,9 @@ class TcpServer : public RdsNetServer {
explicit TcpServer(std::string address);
~TcpServer() override;
GenericRequests GetNewRequests(Error* err) const noexcept override ;
- Error SendResponse(const ReceiverDataServerRequest* request, uint64_t source_id,
+ Error SendResponse(const ReceiverDataServerRequest* request,
const GenericNetworkResponse* response) const noexcept override;
- Error SendResponseAndSlotData(const ReceiverDataServerRequest* request, uint64_t source_id,
- const GenericNetworkResponse* response,
+ Error SendResponseAndSlotData(const ReceiverDataServerRequest* request, const GenericNetworkResponse* response,
const CacheMeta* cache_slot) const noexcept override;
void HandleAfterError(uint64_t source_id) const noexcept override;
std::unique_ptr<IO> io__;
diff --git a/receiver/unittests/receiver_data_server/receiver_dataserver_mocking.h b/receiver/unittests/receiver_data_server/receiver_dataserver_mocking.h
index dc8c1ef9e2bdbde6f7a7128dd505494db16831c2..33df3e79302b00489ed97683992368931e14efdb 100644
--- a/receiver/unittests/receiver_data_server/receiver_dataserver_mocking.h
+++ b/receiver/unittests/receiver_data_server/receiver_dataserver_mocking.h
@@ -27,20 +27,19 @@ class MockNetServer : public RdsNetServer {
MOCK_CONST_METHOD1(GetNewRequests_t, std::vector<ReceiverDataServerRequest> (ErrorInterface**
error));
- Error SendResponse(const ReceiverDataServerRequest* request, uint64_t source_id,
+ Error SendResponse(const ReceiverDataServerRequest* request,
const GenericNetworkResponse* response) const noexcept override {
- return Error{SendResponse_t(request, source_id, response)};
+ return Error{SendResponse_t(request, response)};
};
- MOCK_CONST_METHOD3(SendResponse_t, ErrorInterface * (const ReceiverDataServerRequest* request, uint64_t source_id,
+ MOCK_CONST_METHOD2(SendResponse_t, ErrorInterface * (const ReceiverDataServerRequest* request,
const GenericNetworkResponse* response));
- Error SendResponseAndSlotData(const ReceiverDataServerRequest* request, uint64_t source_id,
- const GenericNetworkResponse* response,
+ Error SendResponseAndSlotData(const ReceiverDataServerRequest* request, const GenericNetworkResponse* response,
const CacheMeta* cache_slot) const noexcept override {
- return Error{SendResponseAndSlotData_t(request, source_id, response, cache_slot)};
+ return Error{SendResponseAndSlotData_t(request, response, cache_slot)};
};
- MOCK_CONST_METHOD4(SendResponseAndSlotData_t, ErrorInterface * (const ReceiverDataServerRequest* request,
- uint64_t source_id, const GenericNetworkResponse* response,
+ MOCK_CONST_METHOD3(SendResponseAndSlotData_t, ErrorInterface * (const ReceiverDataServerRequest* request,
+ const GenericNetworkResponse* response,
const CacheMeta* cache_slot));
void HandleAfterError(uint64_t source_id) const noexcept override {
diff --git a/receiver/unittests/receiver_data_server/test_request_handler.cpp b/receiver/unittests/receiver_data_server/test_request_handler.cpp
index 613aaf47761f722bc7ac7b8f028acdcc327c4881..95bf5fdf0a35fe0fe5da5b43a196292be638bda6 100644
--- a/receiver/unittests/receiver_data_server/test_request_handler.cpp
+++ b/receiver/unittests/receiver_data_server/test_request_handler.cpp
@@ -88,7 +88,6 @@ void RequestHandlerTests::MockGetSlotAndUnlockIt(bool return_without_error) {
void RequestHandlerTests::MockSendResponse(asapo::NetworkErrorCode expected_response_code, bool return_without_error) {
EXPECT_CALL(mock_net, SendResponse_t(
&request,
- expected_source_id,
M_CheckResponse(asapo::kOpcodeGetBufferData, expected_response_code, "")
)).WillOnce(
Return(return_without_error ? nullptr : asapo::IOErrorTemplates::kUnknownIOError.Generate().release())
@@ -99,7 +98,6 @@ void RequestHandlerTests::MockSendResponseAndSlotData(asapo::NetworkErrorCode ex
bool return_without_error) {
EXPECT_CALL(mock_net, SendResponseAndSlotData_t(
&request,
- expected_source_id,
M_CheckResponse(asapo::kOpcodeGetBufferData, expected_response_code, ""),
&expected_meta
)).WillOnce(
diff --git a/receiver/unittests/receiver_data_server/test_tcp_server.cpp b/receiver/unittests/receiver_data_server/test_tcp_server.cpp
index 40b1a4a82ddfe55b30661e27c415a797fbcbc596..3ae9dbe73dafa8716c93ae700116af3e2941f2a6 100644
--- a/receiver/unittests/receiver_data_server/test_tcp_server.cpp
+++ b/receiver/unittests/receiver_data_server/test_tcp_server.cpp
@@ -247,7 +247,7 @@ TEST_F(TCPServerTests, SendResponse) {
EXPECT_CALL(mock_logger, Error(HasSubstr("cannot send")));
- auto err = tcp_server.SendResponse(&expectedRequest, 30, &tmp);
+ auto err = tcp_server.SendResponse(&expectedRequest, &tmp);
ASSERT_THAT(err, Ne(nullptr));
}
@@ -270,7 +270,7 @@ TEST_F(TCPServerTests, SendResponseAndSlotData_SendResponseError) {
));
EXPECT_CALL(mock_logger, Error(HasSubstr("cannot send")));
- auto err = tcp_server.SendResponseAndSlotData(&expectedRequest, 30, &tmp, &expectedMeta);
+ auto err = tcp_server.SendResponseAndSlotData(&expectedRequest, &tmp, &expectedMeta);
ASSERT_THAT(err, Ne(nullptr));
}
@@ -296,7 +296,7 @@ TEST_F(TCPServerTests, SendResponseAndSlotData_SendDataError) {
EXPECT_CALL(mock_logger, Error(HasSubstr("cannot send")));
- auto err = tcp_server.SendResponseAndSlotData(&expectedRequest, 30, &tmp, &expectedMeta);
+ auto err = tcp_server.SendResponseAndSlotData(&expectedRequest, &tmp, &expectedMeta);
ASSERT_THAT(err, Ne(nullptr));
}
@@ -316,7 +316,7 @@ TEST_F(TCPServerTests, SendResponseAndSlotData_Ok) {
EXPECT_CALL(mock_io, Send_t(30, expectedMeta.addr, expectedMeta.size, _))
.WillOnce(Return(expectedMeta.size));
- auto err = tcp_server.SendResponseAndSlotData(&expectedRequest, 30, &tmp, &expectedMeta);
+ auto err = tcp_server.SendResponseAndSlotData(&expectedRequest, &tmp, &expectedMeta);
ASSERT_THAT(err, Eq(nullptr));
}