wip(cat-gateway): implement query trait for statement queries

Author: saibatizoku

catalyst-gateway/bin/src/db/index/queries/mod.rs

@@ -125,7 +125,7 @@ macro_rules! impl_query_statement {
                 session: &std::sync::Arc<scylla::Session>,
                 _: &$crate::settings::cassandra_db::EnvVars,
             ) -> anyhow::Result<$crate::db::index::queries::QueryKind> {
-                Self::prepare(session)
+                Self::prepare(session.clone())
                     .await
                     .map($crate::db::index::queries::QueryKind::Statement)
             }
@@ -285,9 +285,7 @@ async fn prepare_queries(
         ( $( $i:ty),* ) => {
             {
                 let queries = vec![
-                    $(
-                        (TypeId::of::<$i>(), <$i>::prepare_query(session, cfg).await?),
-                    )*
+                    $( (TypeId::of::<$i>(), <$i>::prepare_query(session, cfg).await?), )*
                 ];
                 DashMap::from_iter(queries)
             }
@@ -312,7 +310,15 @@ async fn prepare_queries(
         CatalystIdForStakeAddressInsert,
         // prepared statement queries
         GetTxoByStakeAddressQuery,
-        GetTxiByTxnHashesQuery
+        GetTxiByTxnHashesQuery,
+        GetAssetsByStakeAddressQuery,
+        GetRegistrationQuery,
+        GetStakeAddrQuery,
+        GetStakeAddrFromVoteKeyQuery,
+        GetInvalidRegistrationQuery,
+        GetAllRegistrationsQuery,
+        GetAllInvalidRegistrationsQuery,
+        SyncStatusInsertQuery
     );
     Ok(queries)
 }
@@ -349,8 +355,8 @@ impl PreparedQueries {
         ) = Rbac509InsertQuery::prepare_batch(&session, cfg).await?;
 
         // Prepared Statement queries
-        let txo_by_stake_address_query = GetTxoByStakeAddressQuery::prepare(&session).await;
-        let txi_by_txn_hash_query = GetTxiByTxnHashesQuery::prepare(&session).await;
+        let txo_by_stake_address_query = GetTxoByStakeAddressQuery::prepare(session.clone()).await;
+        let txi_by_txn_hash_query = GetTxiByTxnHashesQuery::prepare(session.clone()).await;
         let native_assets_by_stake_address_query =
             GetAssetsByStakeAddressQuery::prepare(session.clone()).await;
         let registration_from_stake_addr_query =

catalyst-gateway/bin/src/db/index/queries/registrations/get_all_invalids.rs

@@ -8,9 +8,12 @@ use scylla::{
 };
 use tracing::error;
 
-use crate::db::index::{
-    queries::{PreparedQueries, PreparedSelectQuery},
-    session::CassandraSession,
+use crate::{
+    db::index::{
+        queries::{PreparedQueries, PreparedSelectQuery},
+        session::CassandraSession,
+    },
+    impl_query_statement,
 };
 
 /// Get all invalid registrations
@@ -39,6 +42,8 @@ pub(crate) struct GetAllInvalidRegistrationsQuery {
     pub cip36: bool,
 }
 
+impl_query_statement!(GetAllInvalidRegistrationsQuery, GET_ALL_INVALIDS);
+
 impl GetAllInvalidRegistrationsQuery {
     /// Prepares get all registrations
     pub(crate) async fn prepare(session: Arc<Session>) -> anyhow::Result<PreparedStatement> {

catalyst-gateway/bin/src/db/index/queries/registrations/get_all_registrations.rs

@@ -8,12 +8,15 @@ use scylla::{
 };
 use tracing::error;
 
-use crate::db::{
-    index::{
-        queries::{PreparedQueries, PreparedSelectQuery},
-        session::CassandraSession,
+use crate::{
+    db::{
+        index::{
+            queries::{PreparedQueries, PreparedSelectQuery},
+            session::CassandraSession,
+        },
+        types::DbTxnIndex,
     },
-    types::DbTxnIndex,
+    impl_query_statement,
 };
 
 /// Get all registrations
@@ -44,6 +47,8 @@ pub(crate) struct GetAllRegistrationsQuery {
     pub cip36: bool,
 }
 
+impl_query_statement!(GetAllRegistrationsQuery, GET_ALL_REGISTRATIONS);
+
 impl GetAllRegistrationsQuery {
     /// Prepares get all registrations
     pub(crate) async fn prepare(session: Arc<Session>) -> anyhow::Result<PreparedStatement> {

catalyst-gateway/bin/src/db/index/queries/registrations/get_from_stake_addr.rs

@@ -8,12 +8,15 @@ use scylla::{
 };
 use tracing::error;
 
-use crate::db::{
-    index::{
-        queries::{PreparedQueries, PreparedSelectQuery},
-        session::CassandraSession,
+use crate::{
+    db::{
+        index::{
+            queries::{PreparedQueries, PreparedSelectQuery},
+            session::CassandraSession,
+        },
+        types::{DbSlot, DbTxnIndex},
     },
-    types::{DbSlot, DbTxnIndex},
+    impl_query_statement,
 };
 
 /// Get registrations from stake addr query.
@@ -54,6 +57,11 @@ pub(crate) struct GetRegistrationQuery {
     pub cip36: bool,
 }
 
+impl_query_statement!(
+    GetRegistrationQuery,
+    GET_REGISTRATIONS_FROM_STAKE_ADDR_QUERY
+);
+
 impl GetRegistrationQuery {
     /// Prepares a get registration query.
     pub(crate) async fn prepare(session: Arc<Session>) -> anyhow::Result<PreparedStatement> {

catalyst-gateway/bin/src/db/index/queries/registrations/get_from_stake_address.rs

@@ -9,12 +9,15 @@ use scylla::{
 };
 use tracing::error;
 
-use crate::db::{
-    index::{
-        queries::{PreparedQueries, PreparedSelectQuery},
-        session::CassandraSession,
+use crate::{
+    db::{
+        index::{
+            queries::{PreparedQueries, PreparedSelectQuery},
+            session::CassandraSession,
+        },
+        types::DbStakeAddress,
     },
-    types::DbStakeAddress,
+    impl_query_statement,
 };
 
 /// Get stake addr from stake hash query string.
@@ -43,6 +46,8 @@ pub(crate) struct GetStakeAddrQuery {
     pub stake_public_key: Vec<u8>,
 }
 
+impl_query_statement!(GetStakeAddrQuery, GET_QUERY);
+
 impl GetStakeAddrQuery {
     /// Prepares a get get stake addr from stake hash query.
     pub(crate) async fn prepare(session: Arc<Session>) -> anyhow::Result<PreparedStatement> {

catalyst-gateway/bin/src/db/index/queries/registrations/get_from_vote_key.rs

@@ -7,9 +7,12 @@ use scylla::{
 };
 use tracing::error;
 
-use crate::db::index::{
-    queries::{PreparedQueries, PreparedSelectQuery},
-    session::CassandraSession,
+use crate::{
+    db::index::{
+        queries::{PreparedQueries, PreparedSelectQuery},
+        session::CassandraSession,
+    },
+    impl_query_statement,
 };
 
 /// Get stake addr from vote key query.
@@ -36,6 +39,8 @@ pub(crate) struct GetStakeAddrFromVoteKeyQuery {
     pub stake_public_key: Vec<u8>,
 }
 
+impl_query_statement!(GetStakeAddrFromVoteKeyQuery, GET_STAKE_ADDR_FROM_VOTE_KEY);
+
 impl GetStakeAddrFromVoteKeyQuery {
     /// Prepares a get stake addr from vote key query.
     pub(crate) async fn prepare(session: Arc<Session>) -> anyhow::Result<PreparedStatement> {

catalyst-gateway/bin/src/db/index/queries/registrations/get_invalid.rs

@@ -16,6 +16,7 @@ use crate::{
         },
         types::DbSlot,
     },
+    impl_query_statement,
     service::common::types::cardano::slot_no::SlotNo,
 };
 
@@ -59,6 +60,11 @@ pub(crate) struct GetInvalidRegistrationQuery {
     pub cip36: bool,
 }
 
+impl_query_statement!(
+    GetInvalidRegistrationQuery,
+    GET_INVALID_REGISTRATIONS_FROM_STAKE_ADDR_QUERY
+);
+
 impl GetInvalidRegistrationQuery {
     /// Prepares a get invalid registration query.
     pub(crate) async fn prepare(session: Arc<Session>) -> anyhow::Result<PreparedStatement> {

catalyst-gateway/bin/src/db/index/queries/staked_ada/get_assets_by_stake_address.rs

@@ -8,12 +8,15 @@ use scylla::{
 };
 use tracing::error;
 
-use crate::db::{
-    index::{
-        queries::{PreparedQueries, PreparedSelectQuery},
-        session::CassandraSession,
+use crate::{
+    db::{
+        index::{
+            queries::{PreparedQueries, PreparedSelectQuery},
+            session::CassandraSession,
+        },
+        types::{DbSlot, DbStakeAddress, DbTxnIndex, DbTxnOutputOffset},
     },
-    types::{DbSlot, DbStakeAddress, DbTxnIndex, DbTxnOutputOffset},
+    impl_query_statement,
 };
 
 /// Get assets by stake address query string.
@@ -56,6 +59,11 @@ pub(crate) struct GetAssetsByStakeAddressQuery {
     pub value: num_bigint::BigInt,
 }
 
+impl_query_statement!(
+    GetAssetsByStakeAddressQuery,
+    GET_ASSETS_BY_STAKE_ADDRESS_QUERY
+);
+
 impl GetAssetsByStakeAddressQuery {
     /// Prepares a get assets by stake address query.
     pub(crate) async fn prepare(session: Arc<Session>) -> anyhow::Result<PreparedStatement> {

catalyst-gateway/bin/src/db/index/queries/staked_ada/get_txi_by_txn_hash.rs

@@ -1,6 +1,6 @@
 //! Get TXI by Transaction hash query
 
-use std::{fmt, sync::Arc};
+use std::sync::Arc;
 
 use cardano_blockchain_types::TransactionId;
 use scylla::{
@@ -12,12 +12,12 @@ use tracing::error;
 use crate::{
     db::{
         index::{
-            queries::{PreparedQueries, PreparedSelectQuery, Query, QueryKind},
+            queries::{PreparedQueries, PreparedSelectQuery},
             session::CassandraSession,
         },
         types::{DbSlot, DbTransactionId, DbTxnOutputOffset},
     },
-    settings::cassandra_db,
+    impl_query_statement,
 };
 
 /// Get TXI query string.
@@ -49,24 +49,11 @@ pub(crate) struct GetTxiByTxnHashesQuery {
     pub slot_no: DbSlot,
 }
 
-impl Query for GetTxiByTxnHashesQuery {
-    /// Prepare Batch of Insert TXI Index Data Queries
-    async fn prepare_query(
-        session: &Arc<Session>, _cfg: &cassandra_db::EnvVars,
-    ) -> anyhow::Result<QueryKind> {
-        Self::prepare(session).await.map(QueryKind::Statement)
-    }
-}
-
-impl fmt::Display for GetTxiByTxnHashesQuery {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{GET_TXI_BY_TXN_HASHES_QUERY}")
-    }
-}
+impl_query_statement!(GetTxiByTxnHashesQuery, GET_TXI_BY_TXN_HASHES_QUERY);
 
 impl GetTxiByTxnHashesQuery {
     /// Prepares a get txi query.
-    pub(crate) async fn prepare(session: &Arc<Session>) -> anyhow::Result<PreparedStatement> {
+    pub(crate) async fn prepare(session: Arc<Session>) -> anyhow::Result<PreparedStatement> {
         PreparedQueries::prepare(
             session.clone(),
             GET_TXI_BY_TXN_HASHES_QUERY,

catalyst-gateway/bin/src/db/index/queries/staked_ada/get_txo_by_stake_address.rs

@@ -62,9 +62,9 @@ impl_query_statement!(GetTxoByStakeAddressQuery, GET_TXO_BY_STAKE_ADDRESS_QUERY)
 
 impl GetTxoByStakeAddressQuery {
     /// Prepares a get txo by stake address query.
-    pub(crate) async fn prepare(session: &Arc<Session>) -> anyhow::Result<PreparedStatement> {
+    pub(crate) async fn prepare(session: Arc<Session>) -> anyhow::Result<PreparedStatement> {
         PreparedQueries::prepare(
-            session.clone(),
+            session,
             GET_TXO_BY_STAKE_ADDRESS_QUERY,
             scylla::statement::Consistency::All,
             true,