zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zcash_client_sqlite: Remove `*Error` suffixes from `FsBlockDbError` cases

This commit is contained in:
Jack Grigg 2022-12-08 23:22:00 +00:00
parent d0297bff0c
commit 3504d7031c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zcash_client_sqlite/src/lib.rs
View File

@ -845,8 +845,8 @@ pub struct FsBlockDb {
#[derive(Debug)] #[derive(Debug)]
#[cfg(feature = "unstable")] #[cfg(feature = "unstable")]
pub enum FsBlockDbError { pub enum FsBlockDbError {
FsError(io::Error), Fs(io::Error),
DbError(rusqlite::Error), Db(rusqlite::Error),
Protobuf(prost::DecodeError), Protobuf(prost::DecodeError),
InvalidBlockstoreRoot(PathBuf), InvalidBlockstoreRoot(PathBuf),
InvalidBlockPath(PathBuf), InvalidBlockPath(PathBuf),
@ -856,14 +856,14 @@ pub enum FsBlockDbError {
#[cfg(feature = "unstable")] #[cfg(feature = "unstable")]
impl From<io::Error> for FsBlockDbError { impl From<io::Error> for FsBlockDbError {
fn from(err: io::Error) -> Self { fn from(err: io::Error) -> Self {
FsBlockDbError::FsError(err) FsBlockDbError::Fs(err)
} }
} }
#[cfg(feature = "unstable")] #[cfg(feature = "unstable")]
impl From<rusqlite::Error> for FsBlockDbError { impl From<rusqlite::Error> for FsBlockDbError {
fn from(err: rusqlite::Error) -> Self { fn from(err: rusqlite::Error) -> Self {
FsBlockDbError::DbError(err) FsBlockDbError::Db(err)
} }
} }
@ -883,13 +883,13 @@ impl FsBlockDb {
/// `<fsblockdb_root>/blocks` where this block store will expect to find serialized block /// `<fsblockdb_root>/blocks` where this block store will expect to find serialized block
/// files as described for [`FsBlockDb`]. /// files as described for [`FsBlockDb`].
pub fn for_path<P: AsRef<Path>>(fsblockdb_root: P) -> Result<Self, FsBlockDbError> { pub fn for_path<P: AsRef<Path>>(fsblockdb_root: P) -> Result<Self, FsBlockDbError> {
let meta = fs::metadata(&fsblockdb_root).map_err(FsBlockDbError::FsError)?; let meta = fs::metadata(&fsblockdb_root).map_err(FsBlockDbError::Fs)?;
if meta.is_dir() { if meta.is_dir() {
let db_path = fsblockdb_root.as_ref().join("blockmeta.sqlite"); let db_path = fsblockdb_root.as_ref().join("blockmeta.sqlite");
let blocks_dir = fsblockdb_root.as_ref().join("blocks"); let blocks_dir = fsblockdb_root.as_ref().join("blocks");
fs::create_dir_all(&blocks_dir)?; fs::create_dir_all(&blocks_dir)?;
Ok(FsBlockDb { Ok(FsBlockDb {
conn: Connection::open(db_path).map_err(FsBlockDbError::DbError)?, conn: Connection::open(db_path).map_err(FsBlockDbError::Db)?,
blocks_dir, blocks_dir,
}) })
} else { } else {