Merge pull request #1986 from input-output-hk/djo/1956/non_optional_e…

…poch_in_register_signer_msg Make epoch mandatory in `RegisterSignerMessage`
input-output-hk · Oct 8, 2024 · e4f8e3c · e4f8e3c
2 parents 322a8ce + 525751e
commit e4f8e3c
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 79 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.5.74"
+version = "0.5.75"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

diff --git a/mithril-aggregator/src/http_server/routes/signer_routes.rs b/mithril-aggregator/src/http_server/routes/signer_routes.rs
@@ -91,17 +91,7 @@ mod handlers {
             "complete_message" => #?register_signer_message
         );
 
-        let registration_epoch = match register_signer_message.epoch {
-            Some(epoch) => epoch,
-            None => match signer_registerer.get_current_round().await {
-                Some(round) => round.epoch,
-                None => {
-                    let err = SignerRegistrationError::RegistrationRoundNotYetOpened;
-                    warn!("register_signer::error"; "error" => ?err);
-                    return Ok(reply::service_unavailable(err.to_string()));
-                }
-            },
-        };
+        let registration_epoch = register_signer_message.epoch;
 
         let signer = match FromRegisterSignerAdapter::try_adapt(register_signer_message) {
             Ok(signer) => signer,
@@ -292,9 +282,6 @@ mod tests {
         mock_signer_registerer
             .expect_register_signer()
             .return_once(|_, _| Ok(signer_with_stake));
-        mock_signer_registerer
-            .expect_get_current_round()
-            .return_once(|| None);
         let mut dependency_manager = initialize_dependencies().await;
         dependency_manager.signer_registerer = Arc::new(mock_signer_registerer);
 
@@ -333,9 +320,6 @@ mod tests {
                     signer_with_stake,
                 )))
             });
-        mock_signer_registerer
-            .expect_get_current_round()
-            .return_once(|| None);
         let mut dependency_manager = initialize_dependencies().await;
         dependency_manager.signer_registerer = Arc::new(mock_signer_registerer);
 
@@ -373,9 +357,6 @@ mod tests {
                     ProtocolRegistrationError::OpCertInvalid
                 )))
             });
-        mock_signer_registerer
-            .expect_get_current_round()
-            .return_once(|| None);
         let mut dependency_manager = initialize_dependencies().await;
         dependency_manager.signer_registerer = Arc::new(mock_signer_registerer);
 
@@ -413,9 +394,6 @@ mod tests {
                     "an error occurred".to_string(),
                 ))
             });
-        mock_signer_registerer
-            .expect_get_current_round()
-            .return_once(|| None);
         let mut dependency_manager = initialize_dependencies().await;
         dependency_manager.signer_registerer = Arc::new(mock_signer_registerer);
 
@@ -448,9 +426,6 @@ mod tests {
         mock_signer_registerer
             .expect_register_signer()
             .return_once(|_, _| Err(SignerRegistrationError::RegistrationRoundNotYetOpened));
-        mock_signer_registerer
-            .expect_get_current_round()
-            .return_once(|| None);
         let mut dependency_manager = initialize_dependencies().await;
         dependency_manager.signer_registerer = Arc::new(mock_signer_registerer);
 

diff --git a/mithril-common/Cargo.toml b/mithril-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-common"
-version = "0.4.64"
+version = "0.4.65"
 description = "Common types, interfaces, and utilities for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }

diff --git a/mithril-common/src/messages/register_signer.rs b/mithril-common/src/messages/register_signer.rs
diff --git a/mithril-signer/Cargo.toml b/mithril-signer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-signer"
-version = "0.2.194"
+version = "0.2.195"
 description = "A Mithril Signer"
 authors = { workspace = true }
 edition = { workspace = true }

diff --git a/mithril-signer/src/message_adapters/to_register_signer_message.rs b/mithril-signer/src/message_adapters/to_register_signer_message.rs
@@ -14,7 +14,7 @@ impl TryToMessageAdapter<(Epoch, Signer), RegisterSignerMessage>
     /// Method to trigger the conversion.
     fn try_adapt((epoch, signer): (Epoch, Signer)) -> StdResult<RegisterSignerMessage> {
         let message = RegisterSignerMessage {
-            epoch: Some(epoch),
+            epoch,
             party_id: signer.party_id,
             verification_key: signer.verification_key.try_into().with_context(|| {
                 format!(

diff --git a/mithril-test-lab/mithril-end-to-end/Cargo.toml b/mithril-test-lab/mithril-end-to-end/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-end-to-end"
-version = "0.4.34"
+version = "0.4.35"
 authors = { workspace = true }
 edition = { workspace = true }
 documentation = { workspace = true }

diff --git a/mithril-test-lab/mithril-end-to-end/src/stress_test/payload_builder.rs b/mithril-test-lab/mithril-end-to-end/src/stress_test/payload_builder.rs
@@ -32,7 +32,7 @@ pub fn generate_register_signer_message(
         .iter()
         .cloned()
         .map(|signer| RegisterSignerMessage {
-            epoch: Some(epoch),
+            epoch,
             party_id: signer.party_id,
             verification_key: signer.verification_key.to_json_hex().unwrap(),
             verification_key_signature: signer