f Make constructor fallible

Author: tnull

lightning-persister/src/sqlite_store/mod.rs

@@ -39,34 +39,42 @@ impl SqliteStore {
 		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());
+			io::Error::new(e.kind(), 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());
+			io::Error::new(e.kind(), 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");
+				io::Error::new(e.kind(), 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);
+			io::Error::new(e.kind(), msg)
+		})?;
 
 		let connection = Arc::new(Mutex::new(connection));
 		Self { connection, data_dir, kv_table_name }