Merge pull request #156 from input-output-hk/whankinsiv/remove-state-rest-handlers

chore: remove remaining blockfrost REST endpoints from state modules

Author: whankinsiv

Cargo.lock

@@ -4,7 +4,6 @@
 use acropolis_common::{
     messages::{CardanoMessage, Message, StateQuery, StateQueryResponse},
     queries::accounts::{PoolsLiveStakes, DEFAULT_ACCOUNTS_QUERY_TOPIC},
-    rest_helper::handle_rest,
     state_history::{StateHistory, StateHistoryStore},
     BlockInfo, BlockStatus,
 };
@@ -24,13 +23,11 @@ use spo_rewards_publisher::SPORewardsPublisher;
 mod state;
 use state::State;
 mod monetary;
-mod rest;
 mod rewards;
 mod snapshot;
 use acropolis_common::queries::accounts::{
     AccountInfo, AccountsStateQuery, AccountsStateQueryResponse,
 };
-use rest::handle_pots;
 
 const DEFAULT_SPO_STATE_TOPIC: &str = "cardano.spo.state";
 const DEFAULT_EPOCH_ACTIVITY_TOPIC: &str = "cardano.epoch.activity";
@@ -44,8 +41,6 @@ const DEFAULT_SPO_DISTRIBUTION_TOPIC: &str = "cardano.spo.distribution";
 const DEFAULT_SPO_REWARDS_TOPIC: &str = "cardano.spo.rewards";
 const DEFAULT_PROTOCOL_PARAMETERS_TOPIC: &str = "cardano.protocol.parameters";
 
-const DEFAULT_HANDLE_POTS_TOPIC: (&str, &str) = ("handle-topic-pots", "rest.get.pots");
-
 /// Accounts State module
 #[module(
     message_type(Message),
@@ -387,12 +382,6 @@ impl AccountsState {
             .get_string("publish-spo-rewards-topic")
             .unwrap_or(DEFAULT_SPO_REWARDS_TOPIC.to_string());
 
-        // REST handler topics
-        let handle_pots_topic = config
-            .get_string(DEFAULT_HANDLE_POTS_TOPIC.0)
-            .unwrap_or(DEFAULT_HANDLE_POTS_TOPIC.1.to_string());
-        info!("Creating request handler on '{}'", handle_pots_topic);
-
         // Query topics
         let accounts_query_topic = config
             .get_string(DEFAULT_ACCOUNTS_QUERY_TOPIC.0)
@@ -405,7 +394,6 @@ impl AccountsState {
             StateHistoryStore::default_block_store(),
         )));
         let history_account_state = history.clone();
-        let history_pots = history.clone();
         let history_tick = history.clone();
 
         context.handle(&accounts_query_topic, move |message| {
@@ -488,10 +476,6 @@ impl AccountsState {
             }
         });
 
-        handle_rest(context.clone(), &handle_pots_topic, move || {
-            handle_pots(history_pots.clone())
-        });
-
         // Ticker to log stats
         let mut tick_subscription = context.subscribe("clock.tick").await?;
         context.clone().run(async move {

modules/accounts_state/src/accounts_state.rs

@@ -110,7 +110,7 @@ impl State {
     }
 
     /// Get the current pot balances
-    pub fn get_pots(&self) -> Pots {
+    pub fn _get_pots(&self) -> Pots {
         self.pots.clone()
     }
 

modules/accounts_state/src/rest.rs

@@ -64,7 +64,9 @@ mod tests {
             number: 42,
             hash: Vec::new(),
             epoch,
+            epoch_slot: 99,
             new_epoch: false,
+            timestamp: 99999,
             era: Era::Conway,
         }
     }

modules/accounts_state/src/state.rs

@@ -123,7 +123,9 @@ mod tests {
             number: epoch * 10,
             hash: Vec::new(),
             epoch,
+            epoch_slot: 99,
             new_epoch: false,
+            timestamp: 99999,
             era: Era::Conway,
         }
     }

modules/epoch_activity_counter/src/epochs_history.rs

@@ -1,10 +1,7 @@
 use std::time::Duration;
 
 use anyhow::Result;
-use blake2::{
-    digest::{Update, VariableOutput},
-    Digest,
-};
+use blake2::digest::{Update, VariableOutput};
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 

modules/epoch_activity_counter/src/state.rs

@@ -24,7 +24,6 @@ use tracing::{error, info, info_span, Instrument};
 mod aggregated_state;
 mod epochs_history;
 mod historical_spo_state;
-mod rest;
 mod retired_pools_history;
 mod spo_state_publisher;
 mod state;