/Certificate/{hash} route returns a beacon instead of a block

Author: Alenar

mithril-aggregator/src/http_server.rs

@@ -202,7 +202,6 @@ mod handlers {
                 let digest = message.clone();
                 let certificate_hash = message;
                 let previous_hash = "".to_string();
-                let block = beacon.immutable_file_number;
                 let timestamp: DateTime<Utc> = Utc::now();
                 let started_at = format!("{:?}", timestamp);
                 let completed_at = started_at.clone();
@@ -228,7 +227,7 @@ mod handlers {
                 let certificate = entities::Certificate::new(
                     certificate_hash,
                     previous_hash,
-                    block,
+                    beacon,
                     protocol_parameters,
                     digest,
                     started_at,

mithril-common/src/entities.rs

@@ -80,9 +80,9 @@ pub struct Certificate {
     #[serde(rename = "previous_hash")]
     pub previous_hash: String,
 
-    /// Cardano chain block number
-    #[serde(rename = "block")]
-    pub block: u64,
+    /// Cardano chain beacon
+    #[serde(rename = "beacon")]
+    pub beacon: Beacon,
 
     /// Protocol parameters
     #[serde(rename = "protocol")]
@@ -115,7 +115,7 @@ impl Certificate {
     pub fn new(
         hash: String,
         previous_hash: String,
-        block: u64,
+        beacon: Beacon,
         protocol_parameters: ProtocolParameters,
         digest: String,
         started_at: String,
@@ -126,7 +126,7 @@ impl Certificate {
         Certificate {
             hash,
             previous_hash,
-            block,
+            beacon,
             protocol_parameters,
             digest,
             started_at,

mithril-common/src/fake_data.rs

@@ -66,15 +66,14 @@ pub fn certificate(certificate_hash: String) -> entities::Certificate {
 
     // Certificate
     let previous_hash = format!("{}0", certificate_hash);
-    let block = beacon.immutable_file_number;
-    let digest = format!("1{}", block).repeat(20);
+    let digest = format!("1{}", beacon.immutable_file_number).repeat(20);
     let started_at = "2006-01-02T15:04:05Z".to_string();
     let completed_at = "2006-01-02T15:04:05Z".to_string();
-    let multisignature = format!("ABC{}", block).repeat(200);
+    let multisignature = format!("ABC{}", beacon.immutable_file_number).repeat(200);
     entities::Certificate::new(
         certificate_hash,
         previous_hash,
-        block,
+        beacon,
         protocol_parameters,
         digest,
         started_at,

mithril-test-lab/mithril-end-to-end/src/Mithril/Aggregator.hs

@@ -33,7 +33,7 @@ data SignerWithStake = SignerWithStake
 data Certificate = Certificate
   { hash :: Text,
     previous_hash :: Text,
-    block :: Word64,
+    beacon :: Beacon,
     protocol :: ProtocolParameters,
     digest :: Text,
     started_at :: UTCTime,

openapi.yaml

@@ -318,7 +318,7 @@ components:
       required:
         - hash
         - previous_hash
-        - block
+        - beacon
         - protocol
         - digest
         - started_at
@@ -334,10 +334,8 @@ components:
           description: Hash of the previous certificate
           type: string
           format: bytes
-        block:
-          description: Cardano chain block number
-          type: integer
-          format: int64
+        beacon:
+          $ref: "#/components/schemas/Beacon"
         protocol:
           description: Protocol parameters
           $ref: "#/components/schemas/ProtocolParameters"