f Make constructor fallible

Author: tnull

lightning-persister/src/sqlite_store/migrations.rs

@@ -1,22 +1,30 @@
 use rusqlite::Connection;
 
-pub(super) fn migrate_schema(connection: &Connection, kv_table_name: &str, from_version: u16, to_version: u16) {
+use lightning::io;
+
+pub(super) fn migrate_schema(connection: &Connection, kv_table_name: &str, from_version: u16, to_version: u16) -> io::Result<()> {
 	assert!(from_version < to_version);
 	if from_version == 1 && to_version == 2 {
 		let sql = format!(
 			"ALTER TABLE {}
 				ADD sub_namespace TEXT DEFAULT \"\" NOT NULL;",
 				kv_table_name);
-		connection
-			.execute(&sql, [])
-			.unwrap_or_else(|e| 
-				panic!("Failed to migrate table {} from user_version {} to {}: {}",
-				kv_table_name, from_version, to_version, e));
-		connection
-			.pragma(Some(rusqlite::DatabaseName::Main), "user_version", to_version, |_| { Ok(()) })
-			.unwrap_or_else(|e| panic!("Failed to upgrade user_version from {} to {}: {}",
-				from_version, to_version, e));
+		connection .execute(&sql, []).map_err(|e| {
+				let msg = format!("Failed to migrate table {} from user_version {} to {}: {}",
+				kv_table_name, from_version, to_version, e);
+				io::Error::new(io::ErrorKind::Other, msg)
+			})?;
+
+		connection.pragma(Some(rusqlite::DatabaseName::Main),
+			"user_version", to_version, |_| {
+				Ok(())
+		}).map_err(|e| {
+			let msg = format!("Failed to upgrade user_version from {} to {}: {}",
+				from_version, to_version, e);
+			io::Error::new(io::ErrorKind::Other, msg)
+		})?;
 	}
+	Ok(())
 }
 
 #[cfg(test)]
@@ -100,7 +108,7 @@ mod tests {
 		}
 
 		// Check we migrate the db just fine without losing our written data.
-		let store = SqliteStore::new(temp_path, Some(db_file_name), Some(kv_table_name));
+		let store = SqliteStore::new(temp_path, Some(db_file_name), Some(kv_table_name)).unwrap();
 		let res = store.read(&test_namespace, "", &test_key).unwrap();
 		assert_eq!(res, test_data);
 

lightning-persister/src/sqlite_store/mod.rs

@@ -69,9 +69,12 @@ impl SqliteStore {
 				io::Error::new(io::ErrorKind::Other, msg)
 			})?;
 		} else if version_res < SCHEMA_USER_VERSION {
-			migrations::migrate_schema(&connection, &kv_table_name, version_res, SCHEMA_USER_VERSION);
+			migrations::migrate_schema(&connection, &kv_table_name, version_res,
+				SCHEMA_USER_VERSION)?;
 		} else if version_res > SCHEMA_USER_VERSION {
-			panic!("Failed to open database: incompatible schema version {}. Expected: {}", version_res, SCHEMA_USER_VERSION);
+			let msg = format!("Failed to open database: incompatible schema version {}. Expected: {}",
+			version_res, SCHEMA_USER_VERSION);
+			return Err(io::Error::new(io::ErrorKind::Other, msg));
 		}
 
 		let sql = format!(