From 3197375abd5383bb4f4934d5572879c1aa77ec05 Mon Sep 17 00:00:00 2001
From: Jonas SPRENGER <sprengerjo@gmail.com>
Date: Sun, 6 Oct 2019 01:28:33 +0200
Subject: [PATCH] WIP get current block
---
lib/modules-lib/bc-db-reader/src/blocks.rs | 31 +++++++++++++++++-----
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/lib/modules-lib/bc-db-reader/src/blocks.rs b/lib/modules-lib/bc-db-reader/src/blocks.rs
index b280dee7..9cafd231 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)
})
}
--
GitLab