diff --git a/lib/modules-lib/bc-db-reader/src/blocks.rs b/lib/modules-lib/bc-db-reader/src/blocks.rs index b280dee7d14ac16a459c0dc8566590fd01b665e7..9cafd2310265a2522aaf872a760660282d4acfec 100644 --- a/lib/modules-lib/bc-db-reader/src/blocks.rs +++ b/lib/modules-lib/bc-db-reader/src/blocks.rs @@ -100,12 +100,31 @@ pub fn get_block<DB: DbReadable>( blockstamp: Blockstamp, ) -> Result<Option<DbBlock>, DbError> { db.read(|r| { - let opt_dal_block = get_dal_block_in_local_blockchain(db, r, blockstamp.id)?; - if opt_dal_block.is_none() { - get_fork_block(db, r, blockstamp) - } else { - Ok(opt_dal_block) - } + get_block_(db, r, blockstamp) + }) +} + +/// Get block +pub fn get_block_<DB: DbReadable, R: DbReader>( + db: &DB, + r: &R, + blockstamp: Blockstamp, +) -> Result<Option<DbBlock>, DbError> { + let opt_dal_block = get_dal_block_in_local_blockchain(db, r, blockstamp.id)?; + if opt_dal_block.is_none() { + get_fork_block(db, r, blockstamp) + } else { + Ok(opt_dal_block) + } +} + +/// Get current block +pub fn get_current_block<DB: DbReadable>( + db: &DB +) -> Result<Option<DbBlock>, DbError> { + db.read(|r| { + let x = current_meta_datas::get_current_blockstamp_(db,r)?.unwrap(); + get_block_(db,r,x) }) }