chore(cat-gateway): Migrate to Rust 2024 edition (#3665)

* Migrate to Rust 2024 edition

* Use proper tag instead of branch reference (Catalyst CI)

* Fix

* Update CI to 3.6

* Update clippy.toml

* Fix formatting for rust catalyst_compression

* Fix formatting for rust catalyst_key_derivation

* BUILDER_WITH_POETRY

* Update Python version

* python-base-deprecated

* Update poetry.lock

* Update pycardano version

* Regenerate poetry lock file

Author: stanislav-tkach

Earthfile

@@ -1,8 +1,8 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.5.28 AS mdlint-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.5.28 AS cspell-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.5.28 AS postgresql-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.6.0 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.6.0 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.6.0 AS postgresql-ci
 
 ARG --global REGISTRY="harbor.shared-services.projectcatalyst.io/dockerhub/library"
 FROM ${REGISTRY}/debian:stable-slim

catalyst-gateway/Cargo.toml

@@ -1,11 +1,11 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "bin",
 ]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 version = "0.0.1"
 authors = [
     "Steven Johnson <[email protected]>"

catalyst-gateway/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.5.28 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.0 AS rust-ci
 IMPORT ../ AS repo-ci
 IMPORT github.com/input-output-hk/catalyst-voices/catalyst-gateway:main AS cat-gateway-main
 

catalyst-gateway/bin/src/build_info.rs

@@ -48,15 +48,15 @@ pub(crate) fn log_build_info() {
     let mut branch = "Unknown".to_string();
     let mut tags = "Unknown".to_string();
 
-    if let Some(ref vc) = info.version_control {
-        if let Some(git) = vc.git() {
-            commit_id.clone_from(&git.commit_short_id);
-            commit_timestamp = git.commit_timestamp.to_rfc3339();
-            if let Some(git_branch) = git.branch.clone() {
-                branch = git_branch;
-            }
-            tags = git.tags.join(",");
+    if let Some(ref vc) = info.version_control
+        && let Some(git) = vc.git()
+    {
+        commit_id.clone_from(&git.commit_short_id);
+        commit_timestamp = git.commit_timestamp.to_rfc3339();
+        if let Some(git_branch) = git.branch.clone() {
+            branch = git_branch;
         }
+        tags = git.tags.join(",");
     }
 
     let ipv4 = utilities::net::get_public_ipv4().to_string();
@@ -65,15 +65,15 @@ pub(crate) fn log_build_info() {
     let mut interfaces: String = "Unknown".to_string();
 
     // Get local IP address v4 and v6
-    if let Ok(network_interfaces) = list_afinet_netifas() {
-        if !network_interfaces.is_empty() {
-            interfaces.clear();
-            for iface in network_interfaces {
-                if !interfaces.is_empty() {
-                    interfaces.push(',');
-                }
-                let _ = write!(interfaces, "{}:{}", iface.0, iface.1);
+    if let Ok(network_interfaces) = list_afinet_netifas()
+        && !network_interfaces.is_empty()
+    {
+        interfaces.clear();
+        for iface in network_interfaces {
+            if !interfaces.is_empty() {
+                interfaces.push(',');
             }
+            let _ = write!(interfaces, "{}:{}", iface.0, iface.1);
         }
     }
 

catalyst-gateway/bin/src/cardano/mod.rs

@@ -4,7 +4,7 @@ use std::{collections::BTreeSet, fmt::Display, sync::Arc, time::Duration};
 
 use cardano_chain_follower::{ChainFollower, ChainSyncConfig, MultiEraBlock, Network, Point, Slot};
 use duration_string::DurationString;
-use futures::{stream::FuturesUnordered, StreamExt};
+use futures::{StreamExt, stream::FuturesUnordered};
 use rand::{Rng, SeedableRng};
 use tokio::sync::watch;
 use tracing::{debug, error, info};
@@ -16,7 +16,7 @@ use crate::{
             roll_forward::{self, PurgeCondition},
         },
         queries::sync_status::{
-            get::{get_sync_status, SyncStatus},
+            get::{SyncStatus, get_sync_status},
             update::update_sync_status,
         },
         session::CassandraSession,
@@ -25,7 +25,7 @@ use crate::{
     service::utilities::health::{
         set_follower_immutable_first_reached_tip, set_follower_live_first_reached_tip,
     },
-    settings::{chain_follower, Settings},
+    settings::{Settings, chain_follower},
 };
 
 /// How long we wait between checks for connection to the indexing DB to be ready.

catalyst-gateway/bin/src/db/event/mod.rs

@@ -2,17 +2,17 @@
 use std::{
     str::FromStr,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, LazyLock, Mutex, OnceLock,
+        atomic::{AtomicBool, Ordering},
     },
     time::Duration,
 };
 
 use error::NotFoundError;
 use futures::{Stream, StreamExt, TryStreamExt};
 use tokio::task::JoinHandle;
-use tokio_postgres::{types::ToSql, Row};
-use tracing::{debug, debug_span, error, info, Instrument};
+use tokio_postgres::{Row, types::ToSql};
+use tracing::{Instrument, debug, debug_span, error, info};
 
 use crate::{
     service::utilities::health::{event_db_is_live, set_event_db_liveness},
@@ -58,8 +58,8 @@ pub(crate) enum EventDBConnectionError {
 
 impl EventDB {
     /// Get a connection from the pool.
-    async fn get_pool_connection(
-    ) -> Result<deadpool::managed::Object<deadpool_postgres::Manager>, EventDBConnectionError> {
+    async fn get_pool_connection()
+    -> Result<deadpool::managed::Object<deadpool_postgres::Manager>, EventDBConnectionError> {
         let pool = EVENT_DB_POOL
             .get()
             .ok_or(EventDBConnectionError::DbPoolUninitialized)?;
@@ -127,7 +127,7 @@ impl EventDB {
     pub(crate) async fn query_stream(
         stmt: &str,
         params: &[&(dyn ToSql + Sync)],
-    ) -> anyhow::Result<impl Stream<Item = anyhow::Result<Row>>> {
+    ) -> anyhow::Result<impl Stream<Item = anyhow::Result<Row>> + use<>> {
         if Self::is_deep_query_enabled() {
             Self::explain_analyze_rollback(stmt, params).await?;
         }

catalyst-gateway/bin/src/db/event/schema_check/mod.rs

@@ -1,10 +1,12 @@
 //! Check if the schema is up-to-date.
 
-use crate::db::event::{EventDB, DATABASE_SCHEMA_VERSION};
+use crate::db::event::{DATABASE_SCHEMA_VERSION, EventDB};
 
 /// Schema in database does not match schema supported by the Crate.
 #[derive(thiserror::Error, Debug, PartialEq, Eq)]
-#[error(" Schema in database does not match schema supported by the Crate. The current schema version: {was}, the schema version we expected: {expected}")]
+#[error(
+    " Schema in database does not match schema supported by the Crate. The current schema version: {was}, the schema version we expected: {expected}"
+)]
 pub(crate) struct MismatchedSchemaError {
     /// The current DB schema version.
     was: i32,

catalyst-gateway/bin/src/db/event/signed_docs/full_signed_doc.rs

@@ -5,7 +5,7 @@ use anyhow::Context;
 use super::SignedDocBody;
 use crate::{
     db::event::{EventDB, EventDBConnectionError},
-    jinja::{get_template, JinjaTemplateSource},
+    jinja::{JinjaTemplateSource, get_template},
 };
 
 /// Insert sql query

catalyst-gateway/bin/src/db/event/signed_docs/mod.rs

@@ -8,8 +8,8 @@ mod signed_doc_body;
 mod tests;
 
 pub(crate) use doc_ref::DocumentRef;
-pub(crate) use full_signed_doc::{FullSignedDoc, StoreError, SELECT_SIGNED_DOCS_TEMPLATE};
+pub(crate) use full_signed_doc::{FullSignedDoc, SELECT_SIGNED_DOCS_TEMPLATE, StoreError};
 pub(crate) use query_filter::DocsQueryFilter;
 pub(crate) use signed_doc_body::{
-    SignedDocBody, FILTERED_COUNT_SIGNED_DOCS_TEMPLATE, FILTERED_SELECT_SIGNED_DOCS_TEMPLATE,
+    FILTERED_COUNT_SIGNED_DOCS_TEMPLATE, FILTERED_SELECT_SIGNED_DOCS_TEMPLATE, SignedDocBody,
 };

catalyst-gateway/bin/src/db/event/signed_docs/signed_doc_body.rs

@@ -4,8 +4,8 @@ use futures::{Stream, StreamExt};
 
 use super::DocsQueryFilter;
 use crate::{
-    db::event::{common::query_limits::QueryLimits, error::NotFoundError, EventDB},
-    jinja::{get_template, JinjaTemplateSource},
+    db::event::{EventDB, common::query_limits::QueryLimits, error::NotFoundError},
+    jinja::{JinjaTemplateSource, get_template},
 };
 
 /// Filtered select sql query jinja template