SQLite: move migration into into new()

cashubtc · Dec 27, 2024 · 16654b1 · 16654b1
1 parent c6e27d0
commit 16654b1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 23 deletions.
diff --git a/crates/cdk-cli/src/main.rs b/crates/cdk-cli/src/main.rs
@@ -108,8 +108,6 @@ async fn main() -> Result<()> {
                 let sql_path = work_dir.join("cdk-cli.sqlite");
                 let sql = WalletSqliteDatabase::new(&sql_path).await?;
 
-                sql.migrate().await;
-
                 Arc::new(sql)
             }
             "redb" => {

diff --git a/crates/cdk-integration-tests/src/bin/fake_wallet.rs b/crates/cdk-integration-tests/src/bin/fake_wallet.rs
@@ -20,7 +20,6 @@ async fn main() -> Result<()> {
         }
         "SQLITE" => {
             let sqlite_db = MintSqliteDatabase::new(&get_temp_dir().join("mint")).await?;
-            sqlite_db.migrate().await;
             start_fake_mint(addr, port, sqlite_db).await?;
         }
         "REDB" => {

diff --git a/crates/cdk-integration-tests/src/main.rs b/crates/cdk-integration-tests/src/main.rs
@@ -50,7 +50,6 @@ async fn main() -> Result<()> {
         }
         "SQLITE" => {
             let sqlite_db = MintSqliteDatabase::new(&get_temp_dir().join("mint")).await?;
-            sqlite_db.migrate().await;
             start_cln_mint(addr, port, sqlite_db).await?;
         }
         "REDB" => {

diff --git a/crates/cdk-mintd/src/main.rs b/crates/cdk-mintd/src/main.rs
@@ -85,9 +85,6 @@ async fn main() -> anyhow::Result<()> {
             DatabaseEngine::Sqlite => {
                 let sql_db_path = work_dir.join("cdk-mintd.sqlite");
                 let sqlite_db = MintSqliteDatabase::new(&sql_db_path).await?;
-
-                sqlite_db.migrate().await;
-
                 Arc::new(sqlite_db)
             }
             DatabaseEngine::Redb => {

diff --git a/crates/cdk-sqlite/src/mint/error.rs b/crates/cdk-sqlite/src/mint/error.rs
@@ -8,6 +8,9 @@ pub enum Error {
     /// SQLX Error
     #[error(transparent)]
     SQLX(#[from] sqlx::Error),
+    /// SQLX Migration Error
+    #[error(transparent)]
+    SQLXMigration(#[from] sqlx::migrate::MigrateError),
     /// NUT00 Error
     #[error(transparent)]
     CDKNUT00(#[from] cdk::nuts::nut00::Error),

diff --git a/crates/cdk-sqlite/src/mint/mod.rs b/crates/cdk-sqlite/src/mint/mod.rs
@@ -49,15 +49,9 @@ impl MintSqliteDatabase {
             .connect_with(db_options)
             .await?;
 
-        Ok(Self { pool })
-    }
+        sqlx::migrate!("./src/mint/migrations").run(&pool).await?;
 
-    /// Migrate [`MintSqliteDatabase`]
-    pub async fn migrate(&self) {
-        sqlx::migrate!("./src/mint/migrations")
-            .run(&self.pool)
-            .await
-            .expect("Could not run migrations");
+        Ok(Self { pool })
     }
 }
 

diff --git a/crates/cdk-sqlite/src/wallet/error.rs b/crates/cdk-sqlite/src/wallet/error.rs
@@ -8,6 +8,9 @@ pub enum Error {
     /// SQLX Error
     #[error(transparent)]
     SQLX(#[from] sqlx::Error),
+    /// SQLX Migration Error
+    #[error(transparent)]
+    SQLXMigration(#[from] sqlx::migrate::MigrateError),
     /// Serde Error
     #[error(transparent)]
     Serde(#[from] serde_json::Error),

diff --git a/crates/cdk-sqlite/src/wallet/mod.rs b/crates/cdk-sqlite/src/wallet/mod.rs
@@ -43,15 +43,9 @@ impl WalletSqliteDatabase {
 
         let pool = SqlitePool::connect(path).await?;
 
-        Ok(Self { pool })
-    }
+        sqlx::migrate!("./src/wallet/migrations").run(&pool).await?;
 
-    /// Migrate [`WalletSqliteDatabase`]
-    pub async fn migrate(&self) {
-        sqlx::migrate!("./src/wallet/migrations")
-            .run(&self.pool)
-            .await
-            .expect("Could not run migrations");
+        Ok(Self { pool })
     }
 
     async fn set_proof_state(&self, y: PublicKey, state: State) -> Result<(), cdk_database::Error> {