input-output-hk
diff --git a/‎catalyst-gateway/bin/src/cli.rs
+1-12 b/‎catalyst-gateway/bin/src/cli.rs
+1-12
diff --git a/‎catalyst-gateway/bin/src/event_db/config.rs
+9-10 b/‎catalyst-gateway/bin/src/event_db/config.rs
+9-10
diff --git a/‎catalyst-gateway/bin/src/event_db/error.rs
+3-53 b/‎catalyst-gateway/bin/src/event_db/error.rs
+3-53
diff --git a/‎catalyst-gateway/bin/src/event_db/follower/mod.rs
+11-16 b/‎catalyst-gateway/bin/src/event_db/follower/mod.rs
+11-16
diff --git a/‎catalyst-gateway/bin/src/event_db/legacy/queries/event/ballot.rs
+5-5 b/‎catalyst-gateway/bin/src/event_db/legacy/queries/event/ballot.rs
+5-5
diff --git a/‎catalyst-gateway/bin/src/event_db/legacy/queries/event/mod.rs
+4-4 b/‎catalyst-gateway/bin/src/event_db/legacy/queries/event/mod.rs
+4-4
diff --git a/‎catalyst-gateway/bin/src/event_db/legacy/queries/event/objective.rs
+1-2 b/‎catalyst-gateway/bin/src/event_db/legacy/queries/event/objective.rs
+1-2
diff --git a/‎catalyst-gateway/bin/src/event_db/legacy/queries/event/proposal.rs
+4-4 b/‎catalyst-gateway/bin/src/event_db/legacy/queries/event/proposal.rs
+4-4
@@ -12,17 +12,6 @@ use crate::{
     state::State,
 };
 
-#[derive(thiserror::Error, Debug)]
-/// All service errors
-pub(crate) enum Error {
-    #[error(transparent)]
-    /// Service oriented errors
-    Service(#[from] service::Error),
-    #[error(transparent)]
-    /// DB oriented errors
-    EventDb(#[from] crate::event_db::error::Error),
-}
-
 #[derive(Parser)]
 #[clap(rename_all = "kebab-case")]
 /// Simple service CLI options
@@ -77,7 +66,7 @@ impl Cli {
 
                     match event_db.get_follower_config().await {
                         Ok(config) => break config,
-                        Err(err) => error!("no config {:?}", err),
+                        Err(err) => error!("No follower config found, error: {err}"),
                     }
                 };
 
 
@@ -4,7 +4,8 @@ use std::str::FromStr;
 use cardano_chain_follower::Network;
 use serde::{Deserialize, Serialize};
 
-use crate::event_db::{Error, EventDB};
+use super::error::NotFoundError;
+use crate::event_db::EventDB;
 
 /// Representation of the `config` table id fields `id`, `id2`, `id3`
 enum ConfigId {
@@ -51,7 +52,7 @@ pub(crate) struct MithrilSnapshotConfig {
 
 impl EventDB {
     /// Config query
-    pub(crate) async fn get_follower_config(&self) -> Result<Vec<FollowerConfig>, Error> {
+    pub(crate) async fn get_follower_config(&self) -> anyhow::Result<Vec<FollowerConfig>> {
         let conn = self.pool.get().await?;
 
         let id = "cardano";
@@ -66,31 +67,29 @@ impl EventDB {
 
         let mut follower_configs = Vec::new();
         for row in rows {
-            let network = Network::from_str(row.try_get::<_, &str>(ConfigId::Id3.as_str())?)
-                .map_err(|e| Error::Unknown(e.to_string()))?;
+            let network = Network::from_str(row.try_get::<_, &str>(ConfigId::Id3.as_str())?)?;
             let config: serde_json::Value = row.try_get("value")?;
 
             let relay = config
                 .get("relay")
-                .ok_or(Error::JsonParseIssue(
+                .ok_or(anyhow::anyhow!(
                     "Cardano follower config does not have `relay` property".to_string(),
                 ))?
                 .as_str()
-                .ok_or(Error::JsonParseIssue(
+                .ok_or(anyhow::anyhow!(
                     "Cardano follower config `relay` not a string type".to_string(),
                 ))?
                 .to_string();
 
             let mithril_snapshot = serde_json::from_value(
                 config
                     .get("mithril_snapshot")
-                    .ok_or(Error::JsonParseIssue(
+                    .ok_or(anyhow::anyhow!(
                         "Cardano follower config does not have `mithril_snapshot` property"
                             .to_string(),
                     ))?
                     .clone(),
-            )
-            .map_err(|e| Error::JsonParseIssue(e.to_string()))?;
+            )?;
 
             follower_configs.push(FollowerConfig {
                 network,
@@ -100,7 +99,7 @@ impl EventDB {
         }
 
         if follower_configs.is_empty() {
-            Err(Error::NoConfig)
+            Err(NotFoundError.into())
         } else {
             Ok(follower_configs)
         }
 
@@ -1,56 +1,6 @@
 //! Database Errors
 
-use bb8::RunError;
-
-/// Event database errors
+/// DB not found error
 #[derive(thiserror::Error, Debug, PartialEq, Eq)]
-pub(crate) enum Error {
-    /// Schema in database does not match schema supported by the Crate.
-    #[error(" Schema in database does not match schema supported by the Crate. The current schema version: {was}, the schema version we expected: {expected}")]
-    MismatchedSchema {
-        /// The current DB schema version.
-        was: i32,
-        /// The expected DB schema version.
-        expected: i32,
-    },
-    /// No DB URL was provided
-    #[error("DB URL is undefined")]
-    NoDatabaseUrl,
-    /// Cannot find this item
-    #[error("Cannot find this item")]
-    NotFound,
-    /// DB connection timeout
-    #[error("Connection to DB timed out")]
-    TimedOut,
-    /// Unknown error
-    #[error("error: {0}")]
-    Unknown(String),
-    /// No config
-    #[error("No config")]
-    NoConfig,
-    /// JSON Parsing error
-    #[error("Unable to parse database data: {0}")]
-    JsonParseIssue(String),
-    /// Unable to extract policy assets
-    #[error("Unable parse assets: {0}")]
-    AssetParsingIssue(String),
-    /// Unable to extract hashed witnesses
-    #[allow(dead_code)]
-    #[error("Unable to extract hashed witnesses: {0}")]
-    HashedWitnessExtraction(String),
-}
-
-impl From<RunError<tokio_postgres::Error>> for Error {
-    fn from(val: RunError<tokio_postgres::Error>) -> Self {
-        match val {
-            RunError::TimedOut => Self::TimedOut,
-            RunError::User(_) => Self::Unknown(val.to_string()),
-        }
-    }
-}
-
-impl From<tokio_postgres::Error> for Error {
-    fn from(val: tokio_postgres::Error) -> Self {
-        Self::Unknown(val.to_string())
-    }
-}
+#[error("Cannot find this item")]
+pub(crate) struct NotFoundError;
@@ -3,7 +3,8 @@
 use cardano_chain_follower::Network;
 use handlebars::Handlebars;
 
-use crate::event_db::{Error, EventDB};
+use super::error::NotFoundError;
+use crate::event_db::EventDB;
 
 /// Block time
 pub type DateTime = chrono::DateTime<chrono::offset::Utc>;
@@ -55,7 +56,7 @@ struct SlotInfoQueryTmplFields {
 
 impl SlotInfoQueryType {
     /// Get SQL query
-    fn get_sql_query(&self) -> Result<String, Error> {
+    fn get_sql_query(&self) -> anyhow::Result<String> {
         let tmpl_fields = match self {
             SlotInfoQueryType::Previous => {
                 SlotInfoQueryTmplFields {
@@ -81,8 +82,7 @@ impl SlotInfoQueryType {
         // disable default `html_escape` function
         // which transforms `<`, `>` symbols to `&lt`, `&gt`
         reg.register_escape_fn(|s| s.into());
-        reg.render_template(SLOT_INFO_SQL_HBS, &tmpl_fields)
-            .map_err(|e| Error::Unknown(e.to_string()))
+        Ok(reg.render_template(SLOT_INFO_SQL_HBS, &tmpl_fields)?)
     }
 }
 
@@ -91,7 +91,7 @@ impl EventDB {
     pub(crate) async fn index_follower_data(
         &self, slot_no: SlotNumber, network: Network, epoch_no: EpochNumber, block_time: DateTime,
         block_hash: BlockHash,
-    ) -> Result<(), Error> {
+    ) -> anyhow::Result<()> {
         let conn = self.pool.get().await?;
 
         let _rows = conn
@@ -110,7 +110,7 @@ impl EventDB {
     /// Get slot info for the provided date-time and network and query type
     pub(crate) async fn get_slot_info(
         &self, date_time: DateTime, network: Network, query_type: SlotInfoQueryType,
-    ) -> Result<(SlotNumber, BlockHash, DateTime), Error> {
+    ) -> anyhow::Result<(SlotNumber, BlockHash, DateTime)> {
         let conn = self.pool.get().await?;
 
         let rows = conn
@@ -120,9 +120,7 @@ impl EventDB {
             ])
             .await?;
 
-        let Some(row) = rows.first() else {
-            return Err(Error::NotFound);
-        };
+        let row = rows.first().ok_or(NotFoundError)?;
 
         let slot_number: SlotNumber = row.try_get(SLOT_NO_COLUMN)?;
         let block_hash = row.try_get(BLOCK_HASH_COLUMN)?;
@@ -134,16 +132,14 @@ impl EventDB {
     /// Start follower from where previous follower left off.
     pub(crate) async fn last_updated_metadata(
         &self, network: Network,
-    ) -> Result<(SlotNumber, BlockHash, DateTime), Error> {
+    ) -> anyhow::Result<(SlotNumber, BlockHash, DateTime)> {
         let conn = self.pool.get().await?;
 
         let rows = conn
             .query(SELECT_UPDATE_STATE_SQL, &[&network.to_string()])
             .await?;
 
-        let Some(row) = rows.first() else {
-            return Err(Error::NotFound);
-        };
+        let row = rows.first().ok_or(NotFoundError)?;
 
         let slot_no = row.try_get(SLOT_NO_COLUMN)?;
         let block_hash = row.try_get(BLOCK_HASH_COLUMN)?;
@@ -157,7 +153,7 @@ impl EventDB {
     pub(crate) async fn refresh_last_updated(
         &self, last_updated: DateTime, slot_no: SlotNumber, block_hash: BlockHash,
         network: Network, machine_id: &MachineId,
-    ) -> Result<(), Error> {
+    ) -> anyhow::Result<()> {
         let conn = self.pool.get().await?;
 
         // Rollback or update
@@ -169,8 +165,7 @@ impl EventDB {
         // All future additions are just updates on ended, slot_no and block_hash
         let _rows = conn
             .query(INSERT_UPDATE_STATE_SQL, &[
-                &i64::try_from(network_id)
-                    .map_err(|_| Error::Unknown("Network id out of range".to_string()))?,
+                &i64::try_from(network_id)?,
                 &last_updated,
                 &last_updated,
                 &machine_id,
 
@@ -2,7 +2,7 @@
 use std::collections::HashMap;
 
 use crate::event_db::{
-    error::Error,
+    error::NotFoundError,
     legacy::types::{
         ballot::{
             Ballot, BallotType, GroupVotePlans, ObjectiveBallots, ObjectiveChoices, ProposalBallot,
@@ -52,7 +52,7 @@ impl EventDB {
     #[allow(dead_code)]
     pub(crate) async fn get_ballot(
         &self, event: EventId, objective: ObjectiveId, proposal: ProposalId,
-    ) -> Result<Ballot, Error> {
+    ) -> anyhow::Result<Ballot> {
         let conn = self.pool.get().await?;
 
         let rows = conn
@@ -62,7 +62,7 @@ impl EventDB {
                 &proposal.0,
             ])
             .await?;
-        let row = rows.first().ok_or(Error::NotFound)?;
+        let row = rows.first().ok_or(NotFoundError)?;
         let choices = row.try_get("objective")?;
 
         let rows = conn
@@ -95,7 +95,7 @@ impl EventDB {
     #[allow(dead_code)]
     pub(crate) async fn get_objective_ballots(
         &self, event: EventId, objective: ObjectiveId,
-    ) -> Result<Vec<ProposalBallot>, Error> {
+    ) -> anyhow::Result<Vec<ProposalBallot>> {
         let conn = self.pool.get().await?;
 
         let rows = conn
@@ -145,7 +145,7 @@ impl EventDB {
     #[allow(dead_code)]
     pub(crate) async fn get_event_ballots(
         &self, event: EventId,
-    ) -> Result<Vec<ObjectiveBallots>, Error> {
+    ) -> anyhow::Result<Vec<ObjectiveBallots>> {
         let conn = self.pool.get().await?;
 
         let rows = conn
 
@@ -2,7 +2,7 @@
 use chrono::{NaiveDateTime, Utc};
 
 use crate::event_db::{
-    error::Error,
+    error::NotFoundError,
     legacy::types::event::{
         Event, EventDetails, EventGoal, EventId, EventRegistration, EventSchedule, EventSummary,
         VotingPowerAlgorithm, VotingPowerSettings,
@@ -44,7 +44,7 @@ impl EventDB {
     #[allow(dead_code)]
     pub(crate) async fn get_events(
         &self, limit: Option<i64>, offset: Option<i64>,
-    ) -> Result<Vec<EventSummary>, Error> {
+    ) -> anyhow::Result<Vec<EventSummary>> {
         let conn = self.pool.get().await?;
 
         let rows = conn
@@ -76,11 +76,11 @@ impl EventDB {
 
     /// Get event query
     #[allow(dead_code)]
-    pub(crate) async fn get_event(&self, event: EventId) -> Result<Event, Error> {
+    pub(crate) async fn get_event(&self, event: EventId) -> anyhow::Result<Event> {
         let conn = self.pool.get().await?;
 
         let rows = conn.query(Self::EVENT_QUERY, &[&event.0]).await?;
-        let row = rows.first().ok_or(Error::NotFound)?;
+        let row = rows.first().ok_or(NotFoundError)?;
 
         let ends = row
             .try_get::<&'static str, Option<NaiveDateTime>>("end_time")?
 
@@ -1,6 +1,5 @@
 //! Objective Queries
 use crate::event_db::{
-    error::Error,
     legacy::types::{
         event::EventId,
         objective::{
@@ -33,7 +32,7 @@ impl EventDB {
     #[allow(dead_code)]
     pub(crate) async fn get_objectives(
         &self, event: EventId, limit: Option<i64>, offset: Option<i64>,
-    ) -> Result<Vec<Objective>, Error> {
+    ) -> anyhow::Result<Vec<Objective>> {
         let conn = self.pool.get().await?;
 
         let rows = conn
 
@@ -1,6 +1,6 @@
 //! Proposal Queries
 use crate::event_db::{
-    error::Error,
+    error::NotFoundError,
     legacy::types::{
         event::EventId,
         objective::ObjectiveId,
@@ -32,15 +32,15 @@ impl EventDB {
     #[allow(dead_code)]
     pub(crate) async fn get_proposal(
         &self, event: EventId, objective: ObjectiveId, proposal: ProposalId,
-    ) -> Result<Proposal, Error> {
+    ) -> anyhow::Result<Proposal> {
         let conn: bb8::PooledConnection<
             bb8_postgres::PostgresConnectionManager<tokio_postgres::NoTls>,
         > = self.pool.get().await?;
 
         let rows = conn
             .query(Self::PROPOSAL_QUERY, &[&event.0, &objective.0, &proposal.0])
             .await?;
-        let row = rows.first().ok_or(Error::NotFound)?;
+        let row = rows.first().ok_or(NotFoundError)?;
 
         let proposer = vec![ProposerDetails {
             name: row.try_get("proposer_name")?,
@@ -71,7 +71,7 @@ impl EventDB {
     #[allow(dead_code)]
     pub(crate) async fn get_proposals(
         &self, event: EventId, objective: ObjectiveId, limit: Option<i64>, offset: Option<i64>,
-    ) -> Result<Vec<ProposalSummary>, Error> {
+    ) -> anyhow::Result<Vec<ProposalSummary>> {
         let conn = self.pool.get().await?;
 
         let rows = conn