f Make constructor fallible

Author: tnull

lightning-persister/src/sqlite_store/mod.rs

@@ -3,6 +3,7 @@ use crate::utils::check_namespace_key_validity;
 
 use lightning::util::persist::KVStore;
 use lightning::util::string::PrintableString;
+use lightning::io;
 
 use rusqlite::{named_params, Connection};
 
@@ -35,41 +36,49 @@ impl SqliteStore {
 	/// given `db_file_name` (or the default to [`DEFAULT_SQLITE_DB_FILE_NAME`] if set to `None`).
 	///
 	/// Similarly, the given `kv_table_name` will be used or default to [`DEFAULT_KV_TABLE_NAME`].
-	pub fn new(data_dir: PathBuf, db_file_name: Option<String>, kv_table_name: Option<String>) -> Self {
+	pub fn new(data_dir: PathBuf, db_file_name: Option<String>, kv_table_name: Option<String>) -> io::Result<Self> {
 		let db_file_name = db_file_name.unwrap_or(DEFAULT_SQLITE_DB_FILE_NAME.to_string());
 		let kv_table_name = kv_table_name.unwrap_or(DEFAULT_KV_TABLE_NAME.to_string());
 
-		fs::create_dir_all(data_dir.clone()).unwrap_or_else(|_| {
-			panic!("Failed to create database destination directory: {}", data_dir.display())
-		});
+		fs::create_dir_all(data_dir.clone()).map_err(|e| {
+			let msg = format!("Failed to create database destination directory {}: {}",
+				data_dir.display(), e);
+			io::Error::new(io::ErrorKind::Other, msg)
+		})?;
 		let mut db_file_path = data_dir.clone();
 		db_file_path.push(db_file_name);
 
-		let connection = Connection::open(db_file_path.clone()).unwrap_or_else(|_| {
-			panic!("Failed to open/create database file: {}", db_file_path.display())
-		});
+		let connection = Connection::open(db_file_path.clone()).map_err(|e| {
+			let msg = format!("Failed to open/create database file {}: {}",
+				db_file_path.display(), e);
+			io::Error::new(io::ErrorKind::Other, msg)
+		})?;
 
-		connection
-			.pragma(Some(rusqlite::DatabaseName::Main), "user_version", SCHEMA_USER_VERSION, |_| {
+		connection.pragma(Some(rusqlite::DatabaseName::Main),
+			"user_version", SCHEMA_USER_VERSION, |_| {
 				Ok(())
-			})
-			.unwrap_or_else(|_| panic!("Failed to set PRAGMA user_version"));
+			}).map_err(|e| {
+				let msg = format!("Failed to set PRAGMA user_version: {}", e);
+				io::Error::new(io::ErrorKind::Other, msg)
+			})?;
 
 		let sql = format!(
 			"CREATE TABLE IF NOT EXISTS {} (
 			namespace TEXT NOT NULL,
 			sub_namespace TEXT DEFAULT \"\" NOT NULL,
 			key TEXT NOT NULL CHECK (key <> ''),
 			value BLOB, PRIMARY KEY ( namespace, sub_namespace, key )
-		);",
+			);",
 			kv_table_name
 		);
-		connection
-			.execute(&sql, [])
-			.unwrap_or_else(|_| panic!("Failed to create table: {}", kv_table_name));
+
+		connection.execute(&sql, []).map_err(|e| {
+			let msg = format!("Failed to create table {}: {}", kv_table_name, e);
+			io::Error::new(io::ErrorKind::Other, msg)
+		})?;
 
 		let connection = Arc::new(Mutex::new(connection));
-		Self { connection, data_dir, kv_table_name }
+		Ok(Self { connection, data_dir, kv_table_name })
 	}
 
 	/// Returns the data directory.
@@ -231,16 +240,16 @@ mod tests {
 	fn read_write_remove_list_persist() {
 		let mut temp_path = std::env::temp_dir();
 		temp_path.push("read_write_remove_list_persist");
-		let store = SqliteStore::new(temp_path, Some("test_db".to_string()), Some("test_table".to_string()));
+		let store = SqliteStore::new(temp_path, Some("test_db".to_string()), Some("test_table".to_string())).unwrap();
 		do_read_write_remove_list_persist(&store);
 	}
 
 	#[test]
 	fn test_sqlite_store() {
 		let mut temp_path = std::env::temp_dir();
 		temp_path.push("test_sqlite_store");
-		let store_0 = SqliteStore::new(temp_path.clone(), Some("test_db_0".to_string()), Some("test_table".to_string()));
-		let store_1 = SqliteStore::new(temp_path, Some("test_db_1".to_string()), Some("test_table".to_string()));
+		let store_0 = SqliteStore::new(temp_path.clone(), Some("test_db_0".to_string()), Some("test_table".to_string())).unwrap();
+		let store_1 = SqliteStore::new(temp_path, Some("test_db_1".to_string()), Some("test_table".to_string())).unwrap();
 		do_test_store(&store_0, &store_1)
 	}
 }
@@ -252,8 +261,8 @@ pub mod bench {
 
 	/// Bench!
 	pub fn bench_sends(bench: &mut Criterion) {
-		let store_a = super::SqliteStore::new("bench_sqlite_store_a".into(), None, None);
-		let store_b = super::SqliteStore::new("bench_sqlite_store_b".into(), None, None);
+		let store_a = super::SqliteStore::new("bench_sqlite_store_a".into(), None, None).unwrap();
+		let store_b = super::SqliteStore::new("bench_sqlite_store_b".into(), None, None).unwrap();
 		lightning::ln::channelmanager::bench::bench_two_sends(
 			bench, "bench_sqlite_persisted_sends", store_a, store_b);
 	}