chore: change name more descriptive

Author: golddydev

common/src/queries/epochs.rs

@@ -13,7 +13,7 @@ pub enum EpochsStateQuery {
     GetEpochStakeDistributionByPool { epoch_number: u64 },
     GetEpochBlockDistribution { epoch_number: u64 },
     GetEpochBlockDistributionByPool { epoch_number: u64 },
-    GetBlocksMintedByPool { vrf_key_hash: KeyHash },
+    GetLatestEpochBlocksMintedByPool { vrf_key_hash: KeyHash },
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
@@ -26,7 +26,7 @@ pub enum EpochsStateQueryResponse {
     EpochStakeDistributionByPool(EpochStakeDistributionByPool),
     EpochBlockDistribution(EpochBlockDistribution),
     EpochBlockDistributionByPool(EpochBlockDistributionByPool),
-    BlocksMintedByPool(u64),
+    LatestEpochBlocksMintedByPool(u64),
 
     NotFound,
     Error(String),

modules/epochs_state/src/epochs_state.rs

@@ -227,9 +227,9 @@ impl EpochsState {
                         }
                     }
 
-                    EpochsStateQuery::GetBlocksMintedByPool { vrf_key_hash } => {
-                        EpochsStateQueryResponse::BlocksMintedByPool(
-                            state.get_blocks_minted_by_pool(vrf_key_hash),
+                    EpochsStateQuery::GetLatestEpochBlocksMintedByPool { vrf_key_hash } => {
+                        EpochsStateQueryResponse::LatestEpochBlocksMintedByPool(
+                            state.get_latest_epoch_blocks_minted_by_pool(vrf_key_hash),
                         )
                     }
 

modules/epochs_state/src/state.rs

@@ -81,7 +81,7 @@ impl State {
         }
     }
 
-    pub fn get_blocks_minted_by_pool(&self, vrf_key_hash: &KeyHash) -> u64 {
+    pub fn get_latest_epoch_blocks_minted_by_pool(&self, vrf_key_hash: &KeyHash) -> u64 {
         self.blocks_minted.get(vrf_key_hash).map(|v| *v as u64).unwrap_or(0)
     }
 }
@@ -172,7 +172,7 @@ mod tests {
             Some(2)
         );
 
-        let blocks_minted = state.get_blocks_minted_by_pool(&keyhash(b"vrf_2"));
+        let blocks_minted = state.get_latest_epoch_blocks_minted_by_pool(&keyhash(b"vrf_2"));
         assert_eq!(blocks_minted, 2);
     }
 
@@ -212,7 +212,7 @@ mod tests {
         assert_eq!(state.epoch_fees, 0);
         assert!(state.blocks_minted.is_empty());
 
-        let blocks_minted = state.get_blocks_minted_by_pool(&keyhash(b"vrf_1"));
+        let blocks_minted = state.get_latest_epoch_blocks_minted_by_pool(&keyhash(b"vrf_1"));
         assert_eq!(blocks_minted, 0);
     }
 
@@ -232,15 +232,24 @@ mod tests {
         block.number += 1;
         state.handle_mint(&block, Some(b"vrf_1"));
         state.handle_fees(&block, 123);
-        assert_eq!(state.get_blocks_minted_by_pool(&keyhash(b"vrf_1")), 2);
+        assert_eq!(
+            state.get_latest_epoch_blocks_minted_by_pool(&keyhash(b"vrf_1")),
+            2
+        );
         history.lock().await.commit(block.number, state);
 
         block = make_rolled_back_block(0);
         let mut state = history.lock().await.get_rolled_back_state(block.number);
         state.handle_mint(&block, Some(b"vrf_2"));
         state.handle_fees(&block, 123);
-        assert_eq!(state.get_blocks_minted_by_pool(&keyhash(b"vrf_1")), 0);
-        assert_eq!(state.get_blocks_minted_by_pool(&keyhash(b"vrf_2")), 1);
+        assert_eq!(
+            state.get_latest_epoch_blocks_minted_by_pool(&keyhash(b"vrf_1")),
+            0
+        );
+        assert_eq!(
+            state.get_latest_epoch_blocks_minted_by_pool(&keyhash(b"vrf_2")),
+            1
+        );
         history.lock().await.commit(block.number, state);
     }
 }

modules/rest_blockfrost/src/handlers/pools.rs

@@ -622,7 +622,7 @@ async fn handle_pools_spo_blockfrost(
 
     // Query blocks_minted from epochs_state
     let epoch_blocks_minted_msg = Arc::new(Message::StateQuery(StateQuery::Epochs(
-        EpochsStateQuery::GetBlocksMintedByPool {
+        EpochsStateQuery::GetLatestEpochBlocksMintedByPool {
             vrf_key_hash: pool_info.vrf_key_hash.clone(),
         },
     )));
@@ -632,7 +632,7 @@ async fn handle_pools_spo_blockfrost(
         epoch_blocks_minted_msg,
         |message| match message {
             Message::StateQueryResponse(StateQueryResponse::Epochs(
-                EpochsStateQueryResponse::BlocksMintedByPool(blocks_minted),
+                EpochsStateQueryResponse::LatestEpochBlocksMintedByPool(blocks_minted),
             )) => Ok(blocks_minted),
             _ => Err(anyhow::anyhow!("Unexpected message type")),
         },