Skip to content

chore: Remove proto field used to migrate payload layout #380

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.

Sign up for GitHub

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

Merged
eichhorl merged 1 commit into from
Jul 17, 2024
Merged

chore: Remove proto field used to migrate payload layout #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions rs/consensus/src/ecdsa/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,6 @@ impl IDkgPayloadMetrics {
"xnet_reshare_agreements",
count_by_master_public_key_id(payload.xnet_reshare_agreements.keys(), &expected_keys),
);
self.payload_metrics_set_without_key_id_label("payload_layout_multiple_keys", 1);
self.payload_metrics_set_without_key_id_label(
"payload_layout_generalized_pre_signatures",
1,
);
self.payload_metrics_set_without_key_id_label(
"key_transcripts",
payload.key_transcripts.len(),
Expand Down
4 changes: 1 addition & 3 deletions rs/protobuf/def/types/v1/idkg.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "types/v1/signature.proto";
import "types/v1/types.proto";

message IDkgPayload {
reserved 2, 3, 4, 9, 11, 12;
reserved 2, 3, 4, 9, 11, 12, 16;
repeated CompletedSignature signature_agreements = 1;
registry.subnet.v1.IDkgTranscriptId next_unused_transcript_id = 5;
repeated registry.subnet.v1.IDkgTranscript idkg_transcripts = 6;
Expand All @@ -19,8 +19,6 @@ message IDkgPayload {
repeated MasterKeyTranscript key_transcripts = 13;
repeated AvailablePreSignature available_pre_signatures = 14;
repeated PreSignatureInProgress pre_signatures_in_creation = 15;
// TODO: retire these fields, once we start using `pre_signatures`.
bool generalized_pre_signatures = 16;
}

message ConsensusResponse {
Expand Down
3 changes: 0 additions & 3 deletions rs/protobuf/src/gen/types/types.v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,6 @@ pub struct IDkgPayload {
pub available_pre_signatures: ::prost::alloc::vec::Vec<AvailablePreSignature>,
#[prost(message, repeated, tag = "15")]
pub pre_signatures_in_creation: ::prost::alloc::vec::Vec<PreSignatureInProgress>,
/// TODO: retire these fields, once we start using `pre_signatures`.
#[prost(bool, tag = "16")]
pub generalized_pre_signatures: bool,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand Down
2 changes: 0 additions & 2 deletions rs/types/types/src/consensus/idkg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,8 +1787,6 @@ impl From<&IDkgPayload> for pb::IDkgPayload {
ongoing_xnet_reshares,
xnet_reshare_agreements,
key_transcripts,
// Kept for backwards compatibility
generalized_pre_signatures: true,
}
}
}
Expand Down