@@ -91,17 +91,7 @@ mod handlers {
9191 "complete_message" => #?register_signer_message
9292 ) ;
9393
94- let registration_epoch = match register_signer_message. epoch {
95- Some ( epoch) => epoch,
96- None => match signer_registerer. get_current_round ( ) . await {
97- Some ( round) => round. epoch ,
98- None => {
99- let err = SignerRegistrationError :: RegistrationRoundNotYetOpened ;
100- warn ! ( "register_signer::error" ; "error" => ?err) ;
101- return Ok ( reply:: service_unavailable ( err. to_string ( ) ) ) ;
102- }
103- } ,
104- } ;
94+ let registration_epoch = register_signer_message. epoch ;
10595
10696 let signer = match FromRegisterSignerAdapter :: try_adapt ( register_signer_message) {
10797 Ok ( signer) => signer,
@@ -292,9 +282,6 @@ mod tests {
292282 mock_signer_registerer
293283 . expect_register_signer ( )
294284 . return_once ( |_, _| Ok ( signer_with_stake) ) ;
295- mock_signer_registerer
296- . expect_get_current_round ( )
297- . return_once ( || None ) ;
298285 let mut dependency_manager = initialize_dependencies ( ) . await ;
299286 dependency_manager. signer_registerer = Arc :: new ( mock_signer_registerer) ;
300287
@@ -333,9 +320,6 @@ mod tests {
333320 signer_with_stake,
334321 ) ) )
335322 } ) ;
336- mock_signer_registerer
337- . expect_get_current_round ( )
338- . return_once ( || None ) ;
339323 let mut dependency_manager = initialize_dependencies ( ) . await ;
340324 dependency_manager. signer_registerer = Arc :: new ( mock_signer_registerer) ;
341325
@@ -373,9 +357,6 @@ mod tests {
373357 ProtocolRegistrationError :: OpCertInvalid
374358 ) ) )
375359 } ) ;
376- mock_signer_registerer
377- . expect_get_current_round ( )
378- . return_once ( || None ) ;
379360 let mut dependency_manager = initialize_dependencies ( ) . await ;
380361 dependency_manager. signer_registerer = Arc :: new ( mock_signer_registerer) ;
381362
@@ -413,9 +394,6 @@ mod tests {
413394 "an error occurred" . to_string ( ) ,
414395 ) )
415396 } ) ;
416- mock_signer_registerer
417- . expect_get_current_round ( )
418- . return_once ( || None ) ;
419397 let mut dependency_manager = initialize_dependencies ( ) . await ;
420398 dependency_manager. signer_registerer = Arc :: new ( mock_signer_registerer) ;
421399
@@ -448,9 +426,6 @@ mod tests {
448426 mock_signer_registerer
449427 . expect_register_signer ( )
450428 . return_once ( |_, _| Err ( SignerRegistrationError :: RegistrationRoundNotYetOpened ) ) ;
451- mock_signer_registerer
452- . expect_get_current_round ( )
453- . return_once ( || None ) ;
454429 let mut dependency_manager = initialize_dependencies ( ) . await ;
455430 dependency_manager. signer_registerer = Arc :: new ( mock_signer_registerer) ;
456431
0 commit comments