wip

consensus/src/proposal/block_generator.rs

@@ -80,7 +80,7 @@ impl<T: Operations> Generator<T> {
 
         candidate.sign(&ru.secret_key, ru.pubkey_bls.inner());
 
-        Ok(Message::new_candidate(candidate))
+        Ok(candidate.into())
     }
 
     async fn generate_block(

consensus/src/ratification/handler.rs

@@ -205,7 +205,7 @@ impl RatificationHandler {
             },
         };
 
-        Message::new_quorum(quorum)
+        quorum.into()
     }
 
     pub(crate) fn reset(&mut self, iter: u8, validation: ValidationResult) {

consensus/src/ratification/step.rs

@@ -33,7 +33,7 @@ impl RatificationStep {
         let ratification =
             self::build_ratification_payload(ru, iteration, result);
 
-        let msg = Message::new_ratification(ratification);
+        let msg = Message::from(ratification);
 
         // Publish ratification vote
         info!(event = "send_vote", validation_bitset = result.sv().bitset);

consensus/src/step_votes_reg.rs

@@ -202,7 +202,7 @@ impl AttInfoRegistry {
 
         let payload = payload::Quorum { header, att };
 
-        Message::new_quorum(payload)
+        payload.into()
     }
 
     pub(crate) fn get_failed_atts(&self, to: u8) -> Vec<Option<IterationInfo>> {

consensus/src/validation/handler.rs

@@ -26,9 +26,8 @@ fn final_result(
     quorum: QuorumType,
 ) -> HandleMsgOutput {
     let p = payload::ValidationResult::new(sv, vote, quorum);
-    let msg = Message::from_validation_result(p);
-
-    HandleMsgOutput::Ready(msg)
+    let m = Message::from(p);
+    HandleMsgOutput::Ready(m)
 }
 
 pub struct ValidationHandler {

consensus/src/validation/step.rs

@@ -124,7 +124,7 @@ impl<T: Operations + 'static> ValidationStep<T> {
         // Sign and construct validation message
         let validation = self::build_validation_payload(vote, ru, iteration);
         info!(event = "send_vote", vote = ?validation.vote);
-        let msg = Message::new_validation(validation);
+        let msg = Message::from(validation);
 
         // Publish
         outbound.try_send(msg.clone());