From 3b4df846bb91a344a2c481f21aed52f3457a9999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ciar=C3=A1n=20moyne?= Date: Mon, 22 Aug 2022 16:08:55 +0200 Subject: [PATCH 1/5] update to newer alignment package format --- .../alignment_service/aligned_package.proto | 10 ---------- proto_specs/drift_protocol/meta/meta_info.proto | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 proto_specs/drift_protocol/alignment_service/aligned_package.proto diff --git a/proto_specs/drift_protocol/alignment_service/aligned_package.proto b/proto_specs/drift_protocol/alignment_service/aligned_package.proto deleted file mode 100644 index fa05312..0000000 --- a/proto_specs/drift_protocol/alignment_service/aligned_package.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -package drift.proto.alignment_service; - -import "drift_protocol/common/data_payload.proto"; - -message AlignedPackage { - string topic_name = 1; - repeated common.DataPayload payloads = 2; -} \ No newline at end of file diff --git a/proto_specs/drift_protocol/meta/meta_info.proto b/proto_specs/drift_protocol/meta/meta_info.proto index 795e2e5..a3d105b 100644 --- a/proto_specs/drift_protocol/meta/meta_info.proto +++ b/proto_specs/drift_protocol/meta/meta_info.proto @@ -58,5 +58,6 @@ message AlignmentInfo { repeated PackageInfo packages = 1; message PackageInfo { string topic = 1; // name of source MQTT topic + MetaInfo meta = 2; // meta information } } From c50c0200777f92f91ba0b2fc9a7ff635ca747de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ciar=C3=A1n=20moyne?= Date: Mon, 22 Aug 2022 16:12:00 +0200 Subject: [PATCH 2/5] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4ce956..ad1d6c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,3 +18,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - DRIFT-492: Port to Github, [PR-1](https://github.com/panda-official/DriftProtocol/pull/1) +- HOTFIX: update to newer alignment package format, [PR-4](https://github.com/panda-official/DriftProtocol/pull/4) \ No newline at end of file From 171a894ea215477756b35277fcfcbcdea35f1ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ciar=C3=A1n=20moyne?= Date: Mon, 22 Aug 2022 16:30:32 +0200 Subject: [PATCH 3/5] remove old aligned from build --- cpp/cmake/ProtobufGen.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/cpp/cmake/ProtobufGen.cmake b/cpp/cmake/ProtobufGen.cmake index 82d4b2b..3d9f488 100644 --- a/cpp/cmake/ProtobufGen.cmake +++ b/cpp/cmake/ProtobufGen.cmake @@ -2,7 +2,6 @@ set(PROTO_SPEC_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../proto_specs) # Generate protoc files set(PROTOBUF_SPEC_FILES - ${PROTO_SPEC_ROOT_DIR}/drift_protocol/alignment_service/aligned_package.proto ${PROTO_SPEC_ROOT_DIR}/drift_protocol/common/drift_package.proto ${PROTO_SPEC_ROOT_DIR}/drift_protocol/common/data_payload.proto ${PROTO_SPEC_ROOT_DIR}/drift_protocol/common/status_code.proto @@ -12,7 +11,6 @@ set(PROTOBUF_SPEC_FILES ) set(PROTOBUF_FILES - ${CMAKE_BINARY_DIR}/drift_protocol/alignment_service/aligned_package.pb.cc ${CMAKE_BINARY_DIR}/drift_protocol/common/drift_package.pb.cc ${CMAKE_BINARY_DIR}/drift_protocol/common/data_payload.pb.cc ${CMAKE_BINARY_DIR}/drift_protocol/common/status_code.pb.cc From 49207a920130bb86c4b49782f572165dc9862553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ciar=C3=A1n=20moyne?= Date: Mon, 22 Aug 2022 16:39:25 +0200 Subject: [PATCH 4/5] remove last mention of alignment_service --- cpp/cmake/ProtobufGen.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/cpp/cmake/ProtobufGen.cmake b/cpp/cmake/ProtobufGen.cmake index 3d9f488..2f78a25 100644 --- a/cpp/cmake/ProtobufGen.cmake +++ b/cpp/cmake/ProtobufGen.cmake @@ -21,9 +21,6 @@ set(PROTOBUF_FILES add_custom_command(OUTPUT ${PROTOBUF_FILES} - COMMAND ${Protobuf_PROTOC_EXECUTABLE} -I=${PROTO_SPEC_ROOT_DIR}/ - --cpp_out=${CMAKE_BINARY_DIR} ${PROTO_SPEC_ROOT_DIR}/drift_protocol/alignment_service/* - COMMAND ${Protobuf_PROTOC_EXECUTABLE} -I=${PROTO_SPEC_ROOT_DIR}/ --cpp_out=${CMAKE_BINARY_DIR} ${PROTO_SPEC_ROOT_DIR}/drift_protocol/common/* From c669beccc5f60062fac8d8c1349de03faa40f0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ciar=C3=A1n=20moyne?= Date: Tue, 23 Aug 2022 07:27:01 +0200 Subject: [PATCH 5/5] fix changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad1d6c9..206e42d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,4 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - DRIFT-492: Port to Github, [PR-1](https://github.com/panda-official/DriftProtocol/pull/1) -- HOTFIX: update to newer alignment package format, [PR-4](https://github.com/panda-official/DriftProtocol/pull/4) \ No newline at end of file + +### Removed + +- Remove AlignedPackage and add meta to PackageInfo, [PR-4](https://github.com/panda-official/DriftProtocol/pull/4) \ No newline at end of file