From 9a8a865760e6309a5c6bf2c6987cd3d7d973233a Mon Sep 17 00:00:00 2001
From: Carsten Patzke <carsten.patzke@desy.de>
Date: Tue, 13 Mar 2018 10:56:04 +0100
Subject: [PATCH] Renaming and add comments
---
producer/api/include/producer/producer.h | 2 --
producer/api/src/producer_impl.cpp | 7 +------
receiver/unittests/test_receiver.cpp | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/producer/api/include/producer/producer.h b/producer/api/include/producer/producer.h
index d5049d86f..1d8dbb48e 100644
--- a/producer/api/include/producer/producer.h
+++ b/producer/api/include/producer/producer.h
@@ -20,9 +20,7 @@ enum class ProducerError {
enum class ProducerStatus {
kDisconnected,
- kConnecting,
kConnected,
- kSending,
};
class Producer {
diff --git a/producer/api/src/producer_impl.cpp b/producer/api/src/producer_impl.cpp
index 7de7d25fe..81ceed2c3 100644
--- a/producer/api/src/producer_impl.cpp
+++ b/producer/api/src/producer_impl.cpp
@@ -47,13 +47,10 @@ hidra2::ProducerError hidra2::ProducerImpl::initialize_socket_to_receiver_(const
}
hidra2::ProducerError hidra2::ProducerImpl::ConnectToReceiver(const std::string& receiver_address) {
- if(client_fd_ != -1 && status_ != ProducerStatus::kDisconnected
- && status_ != ProducerStatus::kConnecting) {
+ if(client_fd_ != -1 && status_ != ProducerStatus::kDisconnected) {
return ProducerError::kAlreadyConnected;
}
- status_ = ProducerStatus::kConnecting;
-
ProducerError error;
error = initialize_socket_to_receiver_(receiver_address);
if(error != ProducerError::kNoError) {
@@ -73,8 +70,6 @@ hidra2::ProducerError hidra2::ProducerImpl::Send(uint64_t file_id, const void* d
return ProducerError::kFileTooLarge;
}
- status_ = ProducerStatus::kSending;
-
SendDataRequest sendDataRequest;
sendDataRequest.op_code = kNetOpcodeSendData;
sendDataRequest.request_id = request_id++;
diff --git a/receiver/unittests/test_receiver.cpp b/receiver/unittests/test_receiver.cpp
index cab554541..715eadf0b 100644
--- a/receiver/unittests/test_receiver.cpp
+++ b/receiver/unittests/test_receiver.cpp
@@ -1,7 +1,7 @@
#include <gtest/gtest.h>
#include <gmock/gmock.h>
+#include <unittests/MockIO.h>
#include "../src/receiver.h"
-#include "../../common/cpp/unittests/MockIO.h"
using ::testing::Return;
using ::testing::_;
--
GitLab