fix dependencies in Signer and Client

Author: ghubertpalo

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.2.33"
+version = "0.2.34"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -17,7 +17,7 @@ use tokio::sync::{Mutex, MutexGuard};
 
 use crate::database::provider::StakePoolStore;
 
-/// Errors related to the [StakePoolDistributionService].
+/// Errors related to the [StakeDistributionService].
 #[derive(Debug)]
 pub enum StakePoolDistributionServiceError {
     /// Critical errors cannot be recovered.

mithril-aggregator/src/stake_distribution_service.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-common"
-version = "0.2.28"
+version = "0.2.29"
 authors = { workspace = true }
 edition = { workspace = true }
 documentation = { workspace = true }

mithril-common/Cargo.toml

@@ -29,7 +29,9 @@ where
     /// Create a new SQLiteAdapter instance.
     pub fn new(table_name: &str, connection: Arc<Mutex<Connection>>) -> Result<Self> {
         {
-            let conn = &*connection.blocking_lock();
+            let conn = &*connection
+                .try_lock()
+                .map_err(|e| AdapterError::InitializationError(e.into()))?;
             Self::check_table_exists(conn, table_name)?;
         }
 

mithril-common/src/store/adapter/sqlite_adapter.rs

@@ -41,12 +41,10 @@ pub trait StorePruner {
 
 #[cfg(test)]
 mod tests {
-    use std::{
-        cmp::min,
-        sync::{Arc, Mutex},
-    };
+    use std::{cmp::min, sync::Arc};
 
     use sqlite::Connection;
+    use tokio::sync::Mutex;
 
     use crate::store::adapter::SQLiteAdapter;
 

mithril-common/src/store/store_pruner.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-signer"
-version = "0.2.24"
+version = "0.2.25"
 description = "A Mithril Signer"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-signer/Cargo.toml

@@ -5,7 +5,6 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
 
-use mithril_common::database::{ApplicationNodeType, DatabaseVersionChecker};
 use mithril_signer::{
     Configuration, DefaultConfiguration, ProductionServiceBuilder, ServiceBuilder, SignerRunner,
     SignerState, StateMachine,
@@ -102,13 +101,6 @@ async fn main() -> Result<(), String> {
         .build()
         .await
         .map_err(|e| e.to_string())?;
-    DatabaseVersionChecker::new(
-        slog_scope::logger(),
-        ApplicationNodeType::Signer,
-        config.get_sqlite_file(),
-    )
-    .apply()
-    .map_err(|e| e.to_string())?;
     debug!("Started"; "run_mode" => &args.run_mode, "config" => format!("{config:?}"));
 
     let mut state_machine = StateMachine::new(

mithril-signer/src/main.rs

@@ -7,6 +7,7 @@ use mithril_common::{
     api_version::APIVersionProvider,
     chain_observer::{CardanoCliChainObserver, CardanoCliRunner, ChainObserver},
     crypto_helper::{OpCert, ProtocolPartyId, SerDeShelleyFileFormat},
+    database::{ApplicationNodeType, DatabaseVersionChecker},
     digesters::{
         cache::{ImmutableFileDigestCacheProvider, JsonImmutableFileDigestCacheProviderBuilder},
         ImmutableFileObserver,
@@ -143,6 +144,16 @@ impl<'a> ServiceBuilder for ProductionServiceBuilder<'a> {
 
         let sqlite_db_path = self.config.get_sqlite_file();
         let sqlite_connection = Arc::new(Mutex::new(Connection::open(sqlite_db_path)?));
+        DatabaseVersionChecker::new(
+            slog_scope::logger(),
+            ApplicationNodeType::Signer,
+            sqlite_connection.clone(),
+        )
+        .apply()
+        .await
+        .map_err(|e| -> Box<dyn std::error::Error> {
+            format!("Database migration error {e}").into()
+        })?;
         let protocol_initializer_store = Arc::new(ProtocolInitializerStore::new(
             Box::new(SQLiteAdapter::new(
                 "protocol_initializer",