Skip to content

Commit

Permalink
feat: remove RegisterSeedPeerRequest in AnnouncePeer (#243)
Browse files Browse the repository at this point in the history
Signed-off-by: Gaius <[email protected]>
  • Loading branch information
gaius-qi authored Dec 25, 2023
1 parent bcd02cd commit 55a239e
Show file tree
Hide file tree
Showing 7 changed files with 620 additions and 920 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dragonfly-api"
version = "2.0.71"
version = "2.0.72"
authors = ["Gaius <[email protected]>"]
edition = "2021"
license = "Apache-2.0"
Expand Down
1,263 changes: 586 additions & 677 deletions pkg/apis/scheduler/v2/scheduler.pb.go

Large diffs are not rendered by default.

184 changes: 0 additions & 184 deletions pkg/apis/scheduler/v2/scheduler.pb.validate.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 11 additions & 18 deletions pkg/apis/scheduler/v2/scheduler.proto
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ message RegisterPeerRequest {
common.v2.Download download = 1 [(validate.rules).message.required = true];
}

// RegisterSeedPeerRequest represents seed peer registered request of AnnouncePeerRequest.
message RegisterSeedPeerRequest {
// Download information.
common.v2.Download download = 1 [(validate.rules).message.required = true];
}

// DownloadPeerStartedRequest represents peer download started request of AnnouncePeerRequest.
message DownloadPeerStartedRequest {
}
Expand Down Expand Up @@ -139,18 +133,17 @@ message AnnouncePeerRequest {
option (validate.required) = true;

RegisterPeerRequest register_peer_request = 4;
RegisterSeedPeerRequest register_seed_peer_request = 5;
DownloadPeerStartedRequest download_peer_started_request = 6;
DownloadPeerBackToSourceStartedRequest download_peer_back_to_source_started_request = 7;
RescheduleRequest reschedule_request = 8;
DownloadPeerFinishedRequest download_peer_finished_request = 9;
DownloadPeerBackToSourceFinishedRequest download_peer_back_to_source_finished_request = 10;
DownloadPeerFailedRequest download_peer_failed_request = 11;
DownloadPeerBackToSourceFailedRequest download_peer_back_to_source_failed_request = 12;
DownloadPieceFinishedRequest download_piece_finished_request = 13;
DownloadPieceBackToSourceFinishedRequest download_piece_back_to_source_finished_request = 14;
DownloadPieceFailedRequest download_piece_failed_request = 15;
DownloadPieceBackToSourceFailedRequest download_piece_back_to_source_failed_request = 16;
DownloadPeerStartedRequest download_peer_started_request = 5;
DownloadPeerBackToSourceStartedRequest download_peer_back_to_source_started_request = 6;
RescheduleRequest reschedule_request = 7;
DownloadPeerFinishedRequest download_peer_finished_request = 8;
DownloadPeerBackToSourceFinishedRequest download_peer_back_to_source_finished_request = 9;
DownloadPeerFailedRequest download_peer_failed_request = 10;
DownloadPeerBackToSourceFailedRequest download_peer_back_to_source_failed_request = 11;
DownloadPieceFinishedRequest download_piece_finished_request = 12;
DownloadPieceBackToSourceFinishedRequest download_piece_back_to_source_finished_request = 13;
DownloadPieceFailedRequest download_piece_failed_request = 14;
DownloadPieceBackToSourceFailedRequest download_piece_back_to_source_failed_request = 15;
}
}

Expand Down
29 changes: 11 additions & 18 deletions proto/scheduler.proto
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ message RegisterPeerRequest {
common.v2.Download download = 1;
}

// RegisterSeedPeerRequest represents seed peer registered request of AnnouncePeerRequest.
message RegisterSeedPeerRequest {
// Download information.
common.v2.Download download = 1;
}

// DownloadPeerStartedRequest represents peer download started request of AnnouncePeerRequest.
message DownloadPeerStartedRequest {
}
Expand Down Expand Up @@ -132,18 +126,17 @@ message AnnouncePeerRequest {

oneof request {
RegisterPeerRequest register_peer_request = 4;
RegisterSeedPeerRequest register_seed_peer_request = 5;
DownloadPeerStartedRequest download_peer_started_request = 6;
DownloadPeerBackToSourceStartedRequest download_peer_back_to_source_started_request = 7;
RescheduleRequest reschedule_request = 8;
DownloadPeerFinishedRequest download_peer_finished_request = 9;
DownloadPeerBackToSourceFinishedRequest download_peer_back_to_source_finished_request = 10;
DownloadPeerFailedRequest download_peer_failed_request = 11;
DownloadPeerBackToSourceFailedRequest download_peer_back_to_source_failed_request = 12;
DownloadPieceFinishedRequest download_piece_finished_request = 13;
DownloadPieceBackToSourceFinishedRequest download_piece_back_to_source_finished_request = 14;
DownloadPieceFailedRequest download_piece_failed_request = 15;
DownloadPieceBackToSourceFailedRequest download_piece_back_to_source_failed_request = 16;
DownloadPeerStartedRequest download_peer_started_request = 5;
DownloadPeerBackToSourceStartedRequest download_peer_back_to_source_started_request = 6;
RescheduleRequest reschedule_request = 7;
DownloadPeerFinishedRequest download_peer_finished_request = 8;
DownloadPeerBackToSourceFinishedRequest download_peer_back_to_source_finished_request = 9;
DownloadPeerFailedRequest download_peer_failed_request = 10;
DownloadPeerBackToSourceFailedRequest download_peer_back_to_source_failed_request = 11;
DownloadPieceFinishedRequest download_piece_finished_request = 12;
DownloadPieceBackToSourceFinishedRequest download_piece_back_to_source_finished_request = 13;
DownloadPieceFailedRequest download_piece_failed_request = 14;
DownloadPieceBackToSourceFailedRequest download_piece_back_to_source_failed_request = 15;
}
}

Expand Down
Binary file modified src/descriptor.bin
Binary file not shown.
33 changes: 11 additions & 22 deletions src/scheduler.v2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ pub struct RegisterPeerRequest {
#[prost(message, optional, tag = "1")]
pub download: ::core::option::Option<super::super::common::v2::Download>,
}
/// RegisterSeedPeerRequest represents seed peer registered request of AnnouncePeerRequest.
#[derive(serde::Serialize, serde::Deserialize)]
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct RegisterSeedPeerRequest {
/// Download information.
#[prost(message, optional, tag = "1")]
pub download: ::core::option::Option<super::super::common::v2::Download>,
}
/// DownloadPeerStartedRequest represents peer download started request of AnnouncePeerRequest.
#[derive(serde::Serialize, serde::Deserialize)]
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down Expand Up @@ -174,7 +165,7 @@ pub struct AnnouncePeerRequest {
pub peer_id: ::prost::alloc::string::String,
#[prost(
oneof = "announce_peer_request::Request",
tags = "4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16"
tags = "4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15"
)]
pub request: ::core::option::Option<announce_peer_request::Request>,
}
Expand All @@ -187,36 +178,34 @@ pub mod announce_peer_request {
#[prost(message, tag = "4")]
RegisterPeerRequest(super::RegisterPeerRequest),
#[prost(message, tag = "5")]
RegisterSeedPeerRequest(super::RegisterSeedPeerRequest),
#[prost(message, tag = "6")]
DownloadPeerStartedRequest(super::DownloadPeerStartedRequest),
#[prost(message, tag = "7")]
#[prost(message, tag = "6")]
DownloadPeerBackToSourceStartedRequest(
super::DownloadPeerBackToSourceStartedRequest,
),
#[prost(message, tag = "8")]
#[prost(message, tag = "7")]
RescheduleRequest(super::RescheduleRequest),
#[prost(message, tag = "9")]
#[prost(message, tag = "8")]
DownloadPeerFinishedRequest(super::DownloadPeerFinishedRequest),
#[prost(message, tag = "10")]
#[prost(message, tag = "9")]
DownloadPeerBackToSourceFinishedRequest(
super::DownloadPeerBackToSourceFinishedRequest,
),
#[prost(message, tag = "11")]
#[prost(message, tag = "10")]
DownloadPeerFailedRequest(super::DownloadPeerFailedRequest),
#[prost(message, tag = "12")]
#[prost(message, tag = "11")]
DownloadPeerBackToSourceFailedRequest(
super::DownloadPeerBackToSourceFailedRequest,
),
#[prost(message, tag = "13")]
#[prost(message, tag = "12")]
DownloadPieceFinishedRequest(super::DownloadPieceFinishedRequest),
#[prost(message, tag = "14")]
#[prost(message, tag = "13")]
DownloadPieceBackToSourceFinishedRequest(
super::DownloadPieceBackToSourceFinishedRequest,
),
#[prost(message, tag = "15")]
#[prost(message, tag = "14")]
DownloadPieceFailedRequest(super::DownloadPieceFailedRequest),
#[prost(message, tag = "16")]
#[prost(message, tag = "15")]
DownloadPieceBackToSourceFailedRequest(
super::DownloadPieceBackToSourceFailedRequest,
),
Expand Down

0 comments on commit 55a239e

Please sign in to comment.