fix store_dir creation bug

Author: ghubertpalo

mithril-aggregator/src/command_args.rs

@@ -198,10 +198,13 @@ impl ServeCommand {
 
         // start the monitoring thread
         let mut event_store = dependencies_builder.create_event_store().await?;
+        let event_store_config = config.clone();
         let event_store_thread = tokio::spawn(async move {
             event_store
                 .run(Some(
-                    config.data_stores_directory.join(SQLITE_MONITORING_FILE),
+                    event_store_config
+                        .get_sqlite_dir()
+                        .join(SQLITE_MONITORING_FILE),
                 ))
                 .await
                 .unwrap()

mithril-aggregator/src/configuration.rs

@@ -15,7 +15,6 @@ use crate::{LocalSnapshotUploader, RemoteSnapshotUploader, SnapshotUploader};
 
 // TODO: 'LIST_SNAPSHOTS_MAX_ITEMS' keep as const or in config, or add a parameter to `list_snapshots`?
 pub const LIST_SNAPSHOTS_MAX_ITEMS: usize = 20;
-const SQLITE_FILE: &str = "aggregator.sqlite3";
 
 /// Different kinds of execution environments
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -188,14 +187,14 @@ impl Configuration {
     }
 
     /// Return the file of the SQLite stores. If the directory does not exist, it is created.
-    pub fn get_sqlite_file(&self) -> PathBuf {
+    pub fn get_sqlite_dir(&self) -> PathBuf {
         let store_dir = &self.data_stores_directory;
 
         if !store_dir.exists() {
             std::fs::create_dir_all(store_dir).unwrap();
         }
 
-        self.data_stores_directory.join(SQLITE_FILE)
+        self.data_stores_directory.clone()
     }
 }
 

mithril-aggregator/src/dependency_injection/builder.rs

@@ -51,6 +51,8 @@ use crate::{
 
 use super::{DependenciesBuilderError, Result};
 
+const SQLITE_FILE: &str = "aggregator.sqlite3";
+
 /// Dependencies container builder
 pub struct DependenciesBuilder {
     /// Configuration parameters
@@ -184,7 +186,7 @@ impl DependenciesBuilder {
     async fn build_sqlite_connection(&self) -> Result<Arc<Mutex<Connection>>> {
         let connection = match self.configuration.environment {
             ExecutionEnvironment::Production => {
-                Connection::open(self.configuration.get_sqlite_file())
+                Connection::open(self.configuration.get_sqlite_dir().join(SQLITE_FILE))
             }
             _ => Connection::open(":memory:"),
         };
@@ -414,7 +416,7 @@ impl DependenciesBuilder {
             match self.configuration.environment {
                 ExecutionEnvironment::Production => {
                     let adapter =
-                        SQLiteAdapter::new("certificate", self.get_sqlite_connection().await?)
+                        SQLiteAdapter::new("verification_key", self.get_sqlite_connection().await?)
                             .map_err(|e| DependenciesBuilderError::Initialization {
                                 message: "Cannot create SQLite adapter for VerificationKeyStore."
                                     .to_string(),
@@ -977,6 +979,7 @@ impl DependenciesBuilder {
 
         Ok(dependency_manager)
     }
+
     /// Create dependencies for the [EventStore] task.
     pub async fn create_event_store(&mut self) -> Result<EventStore> {
         let event_store = EventStore::new(self.get_event_transmitter_receiver().await?);
@@ -998,7 +1001,7 @@ impl DependenciesBuilder {
                     error: Some(e.into()),
                 })?
                 .ok_or(DependenciesBuilderError::Initialization {
-                    message: "cannot build aggrgator runner: impossible to retrieve current epoch"
+                    message: "cannot build aggregator runner: impossible to retrieve current epoch"
                         .to_string(),
                     error: None,
                 })?;