divide Certificate into Certificate and CertificateMessage

Author: samkim-crypto

program/src/bls_message.rs

@@ -3,14 +3,9 @@
 use serde::{Deserialize, Serialize};
 
 use {
-    crate::{
-        certificate::{CertificateMessage, CertificateType},
-        vote::Vote,
-    },
+    crate::{certificate::Certificate, vote::Vote},
     bitvec::prelude::*,
     solana_bls::Signature as BLSSignature,
-    solana_hash::Hash,
-    solana_program::clock::Slot,
 };
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -25,6 +20,18 @@ pub struct VoteMessage {
     pub rank: u16,
 }
 
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Clone, Debug, PartialEq)]
+/// BLS vote message, we need rank to look up pubkey
+pub struct CertificateMessage {
+    /// The certificate
+    pub certificate: Certificate,
+    /// The signature
+    pub signature: BLSSignature,
+    /// The bitmap for validators, little endian byte order
+    pub bitmap: BitVec<u8, Lsb0>,
+}
+
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Clone, Debug, PartialEq)]
 #[allow(clippy::large_enum_variant)]
@@ -48,18 +55,12 @@ impl BLSMessage {
 
     /// Create a new certificate message
     pub fn new_certificate(
-        certificate_type: CertificateType,
-        slot: Slot,
-        block_id: Option<Hash>,
-        replayed_bank_hash: Option<Hash>,
+        certificate: Certificate,
         bitmap: BitVec<u8, Lsb0>,
         signature: BLSSignature,
     ) -> Self {
         Self::Certificate(CertificateMessage {
-            certificate_type,
-            slot,
-            block_id,
-            replayed_bank_hash,
+            certificate,
             signature,
             bitmap,
         })

program/src/certificate.rs

@@ -2,10 +2,7 @@
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use {
-    bitvec::prelude::*, solana_bls::Signature as BLSSignature, solana_hash::Hash,
-    solana_program::clock::Slot,
-};
+use {solana_hash::Hash, solana_program::clock::Slot};
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -26,7 +23,7 @@ pub enum CertificateType {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Clone, Debug, PartialEq)]
 /// Certificate Type in Alpenglow
-pub struct CertificateMessage {
+pub struct Certificate {
     /// Certificate type
     pub certificate_type: CertificateType,
     /// The slot of the block
@@ -35,8 +32,4 @@ pub struct CertificateMessage {
     pub block_id: Option<Hash>,
     /// The bank hash of the block
     pub replayed_bank_hash: Option<Hash>,
-    /// The BLS signature
-    pub signature: BLSSignature,
-    /// The bitmap for validators, little endian byte order
-    pub bitmap: BitVec<u8, Lsb0>,
 }