feat(cat-gateway): impl Query for GetTxiByTxnHashesQuery

Author: saibatizoku

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

@@ -242,6 +242,7 @@ async fn prepare_queries(
     }
     // WIP: Adding queries as they implement trait
     let queries = prepare_q!(
+        // prepared batch queries
         TxiInsertQuery,
         TxoInsertQuery,
         TxoAssetInsert,
@@ -251,7 +252,10 @@ async fn prepare_queries(
         Cip36Insert,
         Cip36InvalidInsert,
         Cip36ForVoteKeyInsert,
-        UpdateTxoSpentQuery
+        // prepared statement queries
+        UpdateTxoSpentQuery,
+        GetTxoByStakeAddressQuery,
+        GetTxiByTxnHashesQuery
     );
     Ok(queries)
 }
@@ -263,6 +267,8 @@ impl PreparedQueries {
         session: Arc<Session>, cfg: &cassandra_db::EnvVars,
     ) -> anyhow::Result<Self> {
         // We initialize like this, so that all errors preparing querys get shown before aborting.
+
+        // Prepared batched queries
         let txi_insert_queries = TxiInsertQuery::prepare_batch(&session, cfg).await?;
         let (
             txo_insert_queries,
@@ -278,14 +284,16 @@ impl PreparedQueries {
             cip36_registration_for_vote_key_insert_queries,
         ) = Cip36InsertQuery::prepare_batch(&session, cfg).await?;
         let txo_spent_update_queries = UpdateTxoSpentQuery::prepare_batch(&session, cfg).await?;
-        let txo_by_stake_address_query = GetTxoByStakeAddressQuery::prepare(session.clone()).await;
-        let txi_by_txn_hash_query = GetTxiByTxnHashesQuery::prepare(session.clone()).await;
         let (
             rbac509_registration_insert_queries,
             rbac509_invalid_registration_insert_queries,
             catalyst_id_for_txn_id_insert_queries,
             catalyst_id_for_stake_address_insert_queries,
         ) = 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 native_assets_by_stake_address_query =
             GetAssetsByStakeAddressQuery::prepare(session.clone()).await;
         let registration_from_stake_addr_query =

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::sync::Arc;
+use std::{fmt, sync::Arc};
 
 use cardano_blockchain_types::TransactionId;
 use scylla::{
@@ -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, Query, QueryKind},
+            session::CassandraSession,
+        },
+        types::{DbSlot, DbTransactionId, DbTxnOutputOffset},
     },
-    types::{DbSlot, DbTransactionId, DbTxnOutputOffset},
+    settings::cassandra_db,
 };
 
 /// Get TXI query string.
@@ -46,11 +49,26 @@ 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 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,
+            session.clone(),
             GET_TXI_BY_TXN_HASHES_QUERY,
             scylla::statement::Consistency::All,
             true,

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

@@ -1,5 +1,5 @@
 //! Get the TXO by Stake Address
-use std::sync::Arc;
+use std::{fmt, sync::Arc};
 
 use cardano_blockchain_types::{Slot, StakeAddress};
 use scylla::{
@@ -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, Query, QueryKind},
+            session::CassandraSession,
+        },
+        types::{DbSlot, DbStakeAddress, DbTransactionId, DbTxnIndex, DbTxnOutputOffset},
     },
-    types::{DbSlot, DbStakeAddress, DbTransactionId, DbTxnIndex, DbTxnOutputOffset},
+    settings::cassandra_db,
 };
 
 /// Get txo by stake address query string.
@@ -55,11 +58,26 @@ pub(crate) struct GetTxoByStakeAddressQuery {
     pub spent_slot: Option<DbSlot>,
 }
 
+impl Query for GetTxoByStakeAddressQuery {
+    /// 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 GetTxoByStakeAddressQuery {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{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,
+            session.clone(),
             GET_TXO_BY_STAKE_ADDRESS_QUERY,
             scylla::statement::Consistency::All,
             true,