Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to newer alignment package format #4

Merged
merged 5 commits into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +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)

### Removed

- Remove AlignedPackage and add meta to PackageInfo, [PR-4](https://github.com/panda-official/DriftProtocol/pull/4)
5 changes: 0 additions & 5 deletions cpp/cmake/ProtobufGen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -23,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/*

Expand Down
10 changes: 0 additions & 10 deletions proto_specs/drift_protocol/alignment_service/aligned_package.proto

This file was deleted.

1 change: 1 addition & 0 deletions proto_specs/drift_protocol/meta/meta_info.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}