Open Source: libcommunication (#2959)

Move libcommunication to the libs directory
vmware · Mar 15, 2023 · 5aae67a · 5aae67a
1 parent 87c10ab
commit 5aae67a
Show file tree

Hide file tree

Showing 26 changed files with 18 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -189,7 +189,6 @@ endif()
 add_subdirectory(libs/log)
 link_libraries(logging)
 add_subdirectory(libs)
-add_subdirectory(communication)
 add_subdirectory(kvbc)
 add_subdirectory(performance)
 add_subdirectory(bftengine)

diff --git a/client/bftclient/src/bft_client.cpp b/client/bftclient/src/bft_client.cpp
@@ -17,7 +17,7 @@
 #include "secrets/secrets_manager_plain.h"
 #include "communication/StateControl.hpp"
 #include "crypto/factory.hpp"
-#include "ReplicaConfig.hpp"
+#include "bftengine/ReplicaConfig.hpp"
 
 using namespace concord::diagnostics;
 using namespace concord::secretsmanager;

diff --git a/client/client_pool/include/client/client_pool/external_client.hpp b/client/client_pool/include/client/client_pool/external_client.hpp
@@ -19,7 +19,7 @@
 #include <utility>
 #include <vector>
 #include "client_pool_config.hpp"
-#include "communication/StatusInfo.h"
+#include "communication/StatusInfo.hpp"
 #include "external_client_exception.hpp"
 
 namespace concord {

diff --git a/kvbc/include/Replica.h b/kvbc/include/Replica.h
@@ -18,7 +18,7 @@
 #include "bftengine/Replica.hpp"
 #include "bftengine/ReplicaConfig.hpp"
 #include "bcstatetransfer/SimpleBCStateTransfer.hpp"
-#include "communication/StatusInfo.h"
+#include "communication/StatusInfo.hpp"
 #include "KVBCInterfaces.h"
 #include "replica_state_sync_imp.hpp"
 #include "db_adapter_interface.h"

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
@@ -4,3 +4,5 @@ include(CMakePackageConfigHelpers)
 add_subdirectory(util)
 add_subdirectory(crypto)
 add_subdirectory(secrets)
+add_subdirectory(communication)
+
diff --git a/communication/CMakeLists.txt → libs/communication/CMakeLists.txt b/communication/CMakeLists.txt → libs/communication/CMakeLists.txt
@@ -35,12 +35,17 @@ endif()
 
 target_link_libraries(bftcommunication PUBLIC util concord-crypto)
 
-target_include_directories(bftcommunication PUBLIC ../bftengine/include/bftengine)
-target_include_directories(bftcommunication PUBLIC include)
-target_include_directories(bftcommunication PUBLIC ${util}/include)
-
-
-install(DIRECTORY include/communication DESTINATION include)
+target_include_directories(bftcommunication PUBLIC . ../../bftengine/include)
+
+target_sources(bftcommunication PUBLIC FILE_SET comm_pub_hdrs
+                                       TYPE HEADERS
+                                       FILES CommDefs.hpp
+                                             CommFactory.hpp
+                                             ICommunication.hpp
+                                             StateControl.hpp
+                                             StatusInfo.hpp
+             )
+install(TARGETS bftcommunication FILE_SET comm_pub_hdrs DESTINATION communication)
 
 if (BUILD_TESTING)
     add_subdirectory(tests)

diff --git a/...cation/include/communication/CommDefs.hpp → libs/communication/CommDefs.hpp b/...cation/include/communication/CommDefs.hpp → libs/communication/CommDefs.hpp
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "communication/ICommunication.hpp"
-#include "communication/StatusInfo.h"
+#include "communication/StatusInfo.hpp"
 #include "util/assertUtils.hpp"
 
 #ifdef USE_COMM_TLS_TCP

diff --git a/...ion/include/communication/CommFactory.hpp → libs/communication/CommFactory.hpp b/...ion/include/communication/CommFactory.hpp → libs/communication/CommFactory.hpp
diff --git a/.../include/communication/ICommunication.hpp → libs/communication/ICommunication.hpp b/.../include/communication/ICommunication.hpp → libs/communication/ICommunication.hpp
diff --git a/...on/include/communication/StateControl.hpp → libs/communication/StateControl.hpp b/...on/include/communication/StateControl.hpp → libs/communication/StateControl.hpp
diff --git a/...cation/include/communication/StatusInfo.h → libs/communication/StatusInfo.hpp b/...cation/include/communication/StatusInfo.h → libs/communication/StatusInfo.hpp
diff --git a/communication/src/AsyncTlsConnection.cpp → .../communication/src/AsyncTlsConnection.cpp b/communication/src/AsyncTlsConnection.cpp → .../communication/src/AsyncTlsConnection.cpp
diff --git a/communication/src/AsyncTlsConnection.h → libs/communication/src/AsyncTlsConnection.h b/communication/src/AsyncTlsConnection.h → libs/communication/src/AsyncTlsConnection.h
@@ -26,7 +26,7 @@
 #include "TlsConnectionManager.h"
 #include "TlsDiagnostics.h"
 #include "TlsWriteQueue.h"
-#include "ReplicaConfig.hpp"
+#include "bftengine/ReplicaConfig.hpp"
 
 namespace bft::communication::tls {
 

diff --git a/communication/src/CommFactory.cpp → libs/communication/src/CommFactory.cpp b/communication/src/CommFactory.cpp → libs/communication/src/CommFactory.cpp
diff --git a/communication/src/PlainTcpCommunication.cpp → ...mmunication/src/PlainTcpCommunication.cpp b/communication/src/PlainTcpCommunication.cpp → ...mmunication/src/PlainTcpCommunication.cpp
diff --git a/communication/src/PlainUDPCommunication.cpp → ...mmunication/src/PlainUDPCommunication.cpp b/communication/src/PlainUDPCommunication.cpp → ...mmunication/src/PlainUDPCommunication.cpp
diff --git a/communication/src/TlsConnectionManager.cpp → ...ommunication/src/TlsConnectionManager.cpp b/communication/src/TlsConnectionManager.cpp → ...ommunication/src/TlsConnectionManager.cpp
diff --git a/communication/src/TlsConnectionManager.h → .../communication/src/TlsConnectionManager.h b/communication/src/TlsConnectionManager.h → .../communication/src/TlsConnectionManager.h
diff --git a/communication/src/TlsDiagnostics.h → libs/communication/src/TlsDiagnostics.h b/communication/src/TlsDiagnostics.h → libs/communication/src/TlsDiagnostics.h
diff --git a/...ication/src/TlsMultiplexCommunication.cpp → ...ication/src/TlsMultiplexCommunication.cpp b/...ication/src/TlsMultiplexCommunication.cpp → ...ication/src/TlsMultiplexCommunication.cpp
diff --git a/communication/src/TlsRunner.cpp → libs/communication/src/TlsRunner.cpp b/communication/src/TlsRunner.cpp → libs/communication/src/TlsRunner.cpp
diff --git a/communication/src/TlsRunner.h → libs/communication/src/TlsRunner.h b/communication/src/TlsRunner.h → libs/communication/src/TlsRunner.h
diff --git a/communication/src/TlsTCPCommunication.cpp → ...communication/src/TlsTCPCommunication.cpp b/communication/src/TlsTCPCommunication.cpp → ...communication/src/TlsTCPCommunication.cpp
diff --git a/communication/src/TlsWriteQueue.h → libs/communication/src/TlsWriteQueue.h b/communication/src/TlsWriteQueue.h → libs/communication/src/TlsWriteQueue.h
diff --git a/communication/tests/CMakeLists.txt → libs/communication/tests/CMakeLists.txt b/communication/tests/CMakeLists.txt → libs/communication/tests/CMakeLists.txt
diff --git a/communication/tests/multiplex_comm_test.cpp → ...mmunication/tests/multiplex_comm_test.cpp b/communication/tests/multiplex_comm_test.cpp → ...mmunication/tests/multiplex_comm_test.cpp