From 95590dfb345141ce8b0e7c252acb18a289fc6563 Mon Sep 17 00:00:00 2001 From: kimmy lin <30611210+countvonzero@users.noreply.github.com> Date: Wed, 29 Mar 2023 10:42:54 -0700 Subject: [PATCH 1/2] drop repeated in stream --- release/go/spacemesh/v1/mesh_types.pb.go | 44 ++++++++++++------------ spacemesh/v1/mesh_types.proto | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/release/go/spacemesh/v1/mesh_types.pb.go b/release/go/spacemesh/v1/mesh_types.pb.go index b3015a7a..0e618d01 100644 --- a/release/go/spacemesh/v1/mesh_types.pb.go +++ b/release/go/spacemesh/v1/mesh_types.pb.go @@ -1260,7 +1260,7 @@ type EpochStreamResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Ids []*ActivationId `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids,omitempty"` + Id *ActivationId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } func (x *EpochStreamResponse) Reset() { @@ -1295,9 +1295,9 @@ func (*EpochStreamResponse) Descriptor() ([]byte, []int) { return file_spacemesh_v1_mesh_types_proto_rawDescGZIP(), []int{25} } -func (x *EpochStreamResponse) GetIds() []*ActivationId { +func (x *EpochStreamResponse) GetId() *ActivationId { if x != nil { - return x.Ids + return x.Id } return nil } @@ -1426,24 +1426,24 @@ var file_spacemesh_v1_mesh_types_proto_rawDesc = []byte{ 0x61, 0x79, 0x65, 0x72, 0x22, 0x2a, 0x0a, 0x12, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, - 0x22, 0x43, 0x0a, 0x13, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x70, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x73, 0x68, - 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x52, 0x03, 0x69, 0x64, 0x73, 0x2a, 0x8e, 0x01, 0x0a, 0x13, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x4d, 0x65, 0x73, 0x68, 0x44, 0x61, 0x74, 0x61, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x26, 0x0a, - 0x22, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x44, 0x41, - 0x54, 0x41, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, - 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x27, 0x0a, 0x23, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, - 0x5f, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x5f, - 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x01, 0x12, 0x26, - 0x0a, 0x22, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x44, - 0x41, 0x54, 0x41, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x56, 0x41, 0x54, - 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x70, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x73, 0x68, 0x6f, 0x73, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x2f, 0x67, 0x6f, 0x2f, - 0x73, 0x70, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x41, 0x0a, 0x13, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x70, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x73, 0x68, 0x2e, + 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x52, + 0x02, 0x69, 0x64, 0x2a, 0x8e, 0x01, 0x0a, 0x13, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4d, + 0x65, 0x73, 0x68, 0x44, 0x61, 0x74, 0x61, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x26, 0x0a, 0x22, 0x41, + 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x44, 0x41, 0x54, 0x41, + 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, + 0x44, 0x10, 0x00, 0x12, 0x27, 0x0a, 0x23, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, 0x4d, + 0x45, 0x53, 0x48, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x5f, 0x54, 0x52, + 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x01, 0x12, 0x26, 0x0a, 0x22, + 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x44, 0x41, 0x54, + 0x41, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x56, 0x41, 0x54, 0x49, 0x4f, + 0x4e, 0x53, 0x10, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x73, 0x70, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x73, 0x68, 0x6f, 0x73, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x73, 0x70, + 0x61, 0x63, 0x65, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -1515,7 +1515,7 @@ var file_spacemesh_v1_mesh_types_proto_depIdxs = []int32{ 28, // 15: spacemesh.v1.LayersQueryRequest.end_layer:type_name -> spacemesh.v1.LayerNumber 32, // 16: spacemesh.v1.LayersQueryResponse.layer:type_name -> spacemesh.v1.Layer 32, // 17: spacemesh.v1.LayerStreamResponse.layer:type_name -> spacemesh.v1.Layer - 33, // 18: spacemesh.v1.EpochStreamResponse.ids:type_name -> spacemesh.v1.ActivationId + 33, // 18: spacemesh.v1.EpochStreamResponse.id:type_name -> spacemesh.v1.ActivationId 19, // [19:19] is the sub-list for method output_type 19, // [19:19] is the sub-list for method input_type 19, // [19:19] is the sub-list for extension type_name diff --git a/spacemesh/v1/mesh_types.proto b/spacemesh/v1/mesh_types.proto index 97331481..53ea2b77 100644 --- a/spacemesh/v1/mesh_types.proto +++ b/spacemesh/v1/mesh_types.proto @@ -105,5 +105,5 @@ message EpochStreamRequest { } message EpochStreamResponse { - repeated ActivationId ids = 1; + ActivationId id = 1; } From ad6503896730d586a5dac09d5ac94328ef7871cb Mon Sep 17 00:00:00 2001 From: kimmy lin <30611210+countvonzero@users.noreply.github.com> Date: Wed, 29 Mar 2023 15:07:05 -0700 Subject: [PATCH 2/2] temporarily disable check for breaking change --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 5f356dac..25a170c4 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,6 @@ lint: $(BUF) .PHONY: https https: $(BUF) buf lint - buf breaking --against "$(HTTPS_GIT)#branch=master" # ssh is what we run when testing in CI providers that provide ssh public key authentication. # This does breaking change detection against our remote HTTPS ssh repository.