From be77ec6225e3c84286925f2ee8b4cf9fc1e15bb1 Mon Sep 17 00:00:00 2001 From: librelois <elois@ifee.fr> Date: Tue, 26 Nov 2019 14:43:39 +0100 Subject: [PATCH] [style] bc-db: rename store CURRENT_METADATA --- lib/modules-lib/bc-db-reader/src/constants.rs | 2 +- .../{current_meta_datas.rs => current_metadata.rs} | 12 ++++++------ .../bc-db-reader/src/indexes/identities.rs | 10 +++++----- lib/modules-lib/bc-db-reader/src/lib.rs | 4 ++-- lib/modules-lib/bc-db-reader/src/traits.rs | 4 ++-- .../blockchain/bc-db-writer/src/blocks/fork_tree.rs | 4 ++-- .../{current_meta_datas.rs => current_metadata.rs} | 12 ++++++------ .../bc-db-writer/src/indexes/identities.rs | 6 +++--- .../bc-db-writer/src/indexes/transactions.rs | 6 +++--- lib/modules/blockchain/bc-db-writer/src/lib.rs | 2 +- .../blockchain/bc-db-writer/src/writers/requests.rs | 2 +- lib/modules/blockchain/blockchain/src/dbex.rs | 4 ++-- .../blockchain/blockchain/src/fork/fork_algo.rs | 6 ++---- lib/modules/blockchain/blockchain/src/lib.rs | 4 ++-- .../blockchain/src/sync/apply/blocks_worker.rs | 2 +- .../src/sync/download/json_reader_worker.rs | 2 +- lib/modules/blockchain/blockchain/src/sync/mod.rs | 2 +- lib/tests-tools/bc-db-tests-tools/src/mocks.rs | 4 ++-- 18 files changed, 43 insertions(+), 45 deletions(-) rename lib/modules-lib/bc-db-reader/src/{current_meta_datas.rs => current_metadata.rs} (94%) rename lib/modules/blockchain/bc-db-writer/src/{current_meta_datas.rs => current_metadata.rs} (84%) diff --git a/lib/modules-lib/bc-db-reader/src/constants.rs b/lib/modules-lib/bc-db-reader/src/constants.rs index 9e160a7d..be8fc85f 100644 --- a/lib/modules-lib/bc-db-reader/src/constants.rs +++ b/lib/modules-lib/bc-db-reader/src/constants.rs @@ -23,7 +23,7 @@ pub static DEFAULT_PAGE_SIZE: &usize = &50; //////////////////////////////// /// Current meta datas (CurrentMetaDataKey, ?) -pub static CURRENT_METAS_DATAS: &str = "cmd"; +pub static CURRENT_METADATA: &str = "cmd"; /// Fork blocks referenced in tree or in orphan blockstamps (Blockstamp, BlockDb) pub static FORK_BLOCKS: &str = "fb"; diff --git a/lib/modules-lib/bc-db-reader/src/current_meta_datas.rs b/lib/modules-lib/bc-db-reader/src/current_metadata.rs similarity index 94% rename from lib/modules-lib/bc-db-reader/src/current_meta_datas.rs rename to lib/modules-lib/bc-db-reader/src/current_metadata.rs index 1463a2d3..2210838b 100644 --- a/lib/modules-lib/bc-db-reader/src/current_meta_datas.rs +++ b/lib/modules-lib/bc-db-reader/src/current_metadata.rs @@ -58,7 +58,7 @@ impl CurrentMetaDataKey { pub fn get_db_version<DB: DbReadable>(db: &DB) -> Result<usize, DbError> { db.read(|r| { if let Some(v) = db - .get_int_store(CURRENT_METAS_DATAS) + .get_int_store(CURRENT_METADATA) .get(&r, CurrentMetaDataKey::DbVersion.to_u32())? { if let DbValue::U64(db_version) = v { @@ -76,7 +76,7 @@ pub fn get_db_version<DB: DbReadable>(db: &DB) -> Result<usize, DbError> { pub fn get_currency_name<DB: BcDbInReadTx>(db: &DB) -> Result<Option<CurrencyName>, DbError> { if let Some(v) = db .db() - .get_int_store(CURRENT_METAS_DATAS) + .get_int_store(CURRENT_METADATA) .get(db.r(), CurrentMetaDataKey::CurrencyName.to_u32())? { if let DbValue::Str(curency_name) = v { @@ -93,7 +93,7 @@ pub fn get_currency_name<DB: BcDbInReadTx>(db: &DB) -> Result<Option<CurrencyNam pub fn get_current_blockstamp<DB: BcDbInReadTx>(db: &DB) -> Result<Option<Blockstamp>, DbError> { if let Some(v) = db .db() - .get_int_store(CURRENT_METAS_DATAS) + .get_int_store(CURRENT_METADATA) .get(db.r(), CurrentMetaDataKey::CurrentBlockstamp.to_u32())? { if let DbValue::Blob(current_blockstamp_bytes) = v { @@ -112,7 +112,7 @@ pub fn get_current_blockstamp<DB: BcDbInReadTx>(db: &DB) -> Result<Option<Blocks pub fn get_current_common_time_<DB: BcDbInReadTx>(db: &DB) -> Result<u64, DbError> { if let Some(v) = db .db() - .get_int_store(CURRENT_METAS_DATAS) + .get_int_store(CURRENT_METADATA) .get(db.r(), CurrentMetaDataKey::CurrentBlockchainTime.to_u32())? { if let DbValue::U64(current_common_time) = v { @@ -129,7 +129,7 @@ pub fn get_current_common_time_<DB: BcDbInReadTx>(db: &DB) -> Result<u64, DbErro pub fn get_fork_tree<DB: BcDbInReadTx>(db: &DB) -> Result<ForkTree, DbError> { if let Some(v) = db .db() - .get_int_store(CURRENT_METAS_DATAS) + .get_int_store(CURRENT_METADATA) .get(db.r(), CurrentMetaDataKey::ForkTree.to_u32())? { Ok(from_db_value::<ForkTree>(v)?) @@ -143,7 +143,7 @@ pub fn get_fork_tree<DB: BcDbInReadTx>(db: &DB) -> Result<ForkTree, DbError> { pub fn get_greatest_wot_id_<DB: BcDbInReadTx>(db: &DB) -> Result<WotId, DbError> { if let Some(v) = db .db() - .get_int_store(CURRENT_METAS_DATAS) + .get_int_store(CURRENT_METADATA) .get(db.r(), CurrentMetaDataKey::NextWotId.to_u32())? { if let DbValue::U64(greatest_wot_id) = v { diff --git a/lib/modules-lib/bc-db-reader/src/indexes/identities.rs b/lib/modules-lib/bc-db-reader/src/indexes/identities.rs index 1dbae742..5a43619d 100644 --- a/lib/modules-lib/bc-db-reader/src/indexes/identities.rs +++ b/lib/modules-lib/bc-db-reader/src/indexes/identities.rs @@ -109,7 +109,7 @@ pub fn get_identities<DB: BcDbInReadTx>( } } else { let mut identities: Vec<IdentityDb> = Vec::new(); - let greatest_wot_id = crate::current_meta_datas::get_greatest_wot_id_(db)?; + let greatest_wot_id = crate::current_metadata::get_greatest_wot_id_(db)?; for wot_id in 0..=greatest_wot_id.0 { if let Some(db_idty) = get_identity_by_wot_id(db, WotId(wot_id))? { if filters @@ -181,7 +181,7 @@ pub fn get_uid<DB: BcDbInReadTx>(db: &DB, pubkey: &PubKey) -> Result<Option<Stri /// Get wot id from uid pub fn get_wot_id_from_uid<DB: BcDbInReadTx>(db: &DB, uid: &str) -> Result<Option<WotId>, DbError> { - let greatest_wot_id = crate::current_meta_datas::get_greatest_wot_id_(db)?; + let greatest_wot_id = crate::current_metadata::get_greatest_wot_id_(db)?; for wot_id in 0..=greatest_wot_id.0 { if let Some(db_idty) = get_identity_by_wot_id(db, WotId(wot_id))? { if db_idty.idty_doc.username() == uid { @@ -226,7 +226,7 @@ pub fn get_wot_index<DB: BcDbInReadTx>(db: &DB) -> Result<HashMap<PubKey, WotId> /// Get wot_uid index pub fn get_wot_uid_index<DB: BcDbInReadTx>(db: &DB) -> Result<HashMap<WotId, String>, DbError> { let mut wot_uid_index = HashMap::new(); - let greatest_wot_id = crate::current_meta_datas::get_greatest_wot_id_(db)?; + let greatest_wot_id = crate::current_metadata::get_greatest_wot_id_(db)?; for wot_id in 0..=greatest_wot_id.0 { if let Some(db_idty) = get_identity_by_wot_id(db, WotId(wot_id))? { wot_uid_index.insert(WotId(wot_id), db_idty.idty_doc.username().to_owned()); @@ -239,7 +239,7 @@ pub fn get_wot_uid_index<DB: BcDbInReadTx>(db: &DB) -> Result<HashMap<WotId, Str mod test { use super::*; - use crate::current_meta_datas::CurrentMetaDataKey; + use crate::current_metadata::CurrentMetaDataKey; use crate::paging::PagingFilter; use dubp_common_doc::Blockstamp; use dup_crypto_tests_tools::mocks::pubkey; @@ -298,7 +298,7 @@ mod test { // Write greatest wot id db.write(|mut w| { - db.get_int_store(CURRENT_METAS_DATAS).put( + db.get_int_store(CURRENT_METADATA).put( w.as_mut(), CurrentMetaDataKey::NextWotId.to_u32(), &DbValue::U64(wot_id), diff --git a/lib/modules-lib/bc-db-reader/src/lib.rs b/lib/modules-lib/bc-db-reader/src/lib.rs index 20a90069..3c97e4a6 100644 --- a/lib/modules-lib/bc-db-reader/src/lib.rs +++ b/lib/modules-lib/bc-db-reader/src/lib.rs @@ -29,7 +29,7 @@ pub mod blocks; pub mod constants; pub mod currency_params; -pub mod current_meta_datas; +pub mod current_metadata; pub mod indexes; pub mod paging; pub mod tools; @@ -54,7 +54,7 @@ use std::path::Path; pub fn bc_db_schema() -> KvFileDbSchema { KvFileDbSchema { stores: hashmap![ - CURRENT_METAS_DATAS.to_owned() => KvFileDbStoreType::SingleIntKey, + CURRENT_METADATA.to_owned() => KvFileDbStoreType::SingleIntKey, MAIN_BLOCKS.to_owned() => KvFileDbStoreType::SingleIntKey, FORK_BLOCKS.to_owned() => KvFileDbStoreType::Single, ORPHAN_BLOCKSTAMP.to_owned() => KvFileDbStoreType::Single, diff --git a/lib/modules-lib/bc-db-reader/src/traits.rs b/lib/modules-lib/bc-db-reader/src/traits.rs index ab51e9b4..26b7ca71 100644 --- a/lib/modules-lib/bc-db-reader/src/traits.rs +++ b/lib/modules-lib/bc-db-reader/src/traits.rs @@ -95,11 +95,11 @@ where { #[inline] fn get_current_blockstamp(&self) -> Result<Option<Blockstamp>, DbError> { - crate::current_meta_datas::get_current_blockstamp(self) + crate::current_metadata::get_current_blockstamp(self) } #[inline] fn get_current_block(&self) -> Result<Option<BlockDb>, DbError> { - if let Some(current_blockstamp) = crate::current_meta_datas::get_current_blockstamp(self)? { + if let Some(current_blockstamp) = crate::current_metadata::get_current_blockstamp(self)? { crate::blocks::get_db_block_in_local_blockchain(self, current_blockstamp.id) } else { Ok(None) diff --git a/lib/modules/blockchain/bc-db-writer/src/blocks/fork_tree.rs b/lib/modules/blockchain/bc-db-writer/src/blocks/fork_tree.rs index 8f3bae81..c25bd734 100644 --- a/lib/modules/blockchain/bc-db-writer/src/blocks/fork_tree.rs +++ b/lib/modules/blockchain/bc-db-writer/src/blocks/fork_tree.rs @@ -19,12 +19,12 @@ use crate::*; use dubp_common_doc::BlockHash; use durs_bc_db_reader::blocks::fork_tree::ForkTree; use durs_bc_db_reader::constants::*; -use durs_bc_db_reader::current_meta_datas::CurrentMetaDataKey; +use durs_bc_db_reader::current_metadata::CurrentMetaDataKey; /// SAve fork tree pub fn save_fork_tree(db: &Db, w: &mut DbWriter, fork_tree: &ForkTree) -> Result<(), DbError> { let bin_fork_tree = durs_dbs_tools::to_bytes(&fork_tree)?; - db.get_int_store(CURRENT_METAS_DATAS).put( + db.get_int_store(CURRENT_METADATA).put( w.as_mut(), CurrentMetaDataKey::ForkTree.to_u32(), &Db::db_value(&bin_fork_tree)?, diff --git a/lib/modules/blockchain/bc-db-writer/src/current_meta_datas.rs b/lib/modules/blockchain/bc-db-writer/src/current_metadata.rs similarity index 84% rename from lib/modules/blockchain/bc-db-writer/src/current_meta_datas.rs rename to lib/modules/blockchain/bc-db-writer/src/current_metadata.rs index 0ec353e3..36e1c675 100644 --- a/lib/modules/blockchain/bc-db-writer/src/current_meta_datas.rs +++ b/lib/modules/blockchain/bc-db-writer/src/current_metadata.rs @@ -19,12 +19,12 @@ use crate::*; use dubp_block_doc::block::BlockDocumentTrait; use dubp_block_doc::BlockDocument; use dubp_common_doc::traits::Document; -use durs_bc_db_reader::constants::CURRENT_METAS_DATAS; -use durs_bc_db_reader::current_meta_datas::CurrentMetaDataKey; +use durs_bc_db_reader::constants::CURRENT_METADATA; +use durs_bc_db_reader::current_metadata::CurrentMetaDataKey; use durs_bc_db_reader::DbValue; -/// Update CURRENT_META_DATAS -pub fn update_current_meta_datas( +/// Update CURRENT_METADATA +pub fn update_current_metadata( db: &Db, w: &mut DbWriter, new_current_block: &BlockDocument, @@ -32,13 +32,13 @@ pub fn update_current_meta_datas( let new_current_blockstamp_bytes: Vec<u8> = new_current_block.blockstamp().into(); // Update current blockstamp - db.get_int_store(CURRENT_METAS_DATAS).put( + db.get_int_store(CURRENT_METADATA).put( w.as_mut(), CurrentMetaDataKey::CurrentBlockstamp.to_u32(), &DbValue::Blob(&new_current_blockstamp_bytes), )?; // Update current common time (also named "blockchain time") - db.get_int_store(CURRENT_METAS_DATAS).put( + db.get_int_store(CURRENT_METADATA).put( w.as_mut(), CurrentMetaDataKey::CurrentBlockchainTime.to_u32(), &DbValue::U64(new_current_block.common_time()), diff --git a/lib/modules/blockchain/bc-db-writer/src/indexes/identities.rs b/lib/modules/blockchain/bc-db-writer/src/indexes/identities.rs index 10e5c88b..8f445a10 100644 --- a/lib/modules/blockchain/bc-db-writer/src/indexes/identities.rs +++ b/lib/modules/blockchain/bc-db-writer/src/indexes/identities.rs @@ -23,7 +23,7 @@ use dubp_user_docs::documents::identity::IdentityDocumentV10; use dup_crypto::keys::PubKey; use dup_crypto::keys::PublicKey; use durs_bc_db_reader::constants::*; -use durs_bc_db_reader::current_meta_datas::CurrentMetaDataKey; +use durs_bc_db_reader::current_metadata::CurrentMetaDataKey; use durs_bc_db_reader::indexes::identities::get_wot_id; use durs_bc_db_reader::indexes::identities::{IdentityDb, IdentityStateDb}; use durs_bc_db_reader::{DbReadable, DbValue}; @@ -57,7 +57,7 @@ pub fn revert_create_identity(db: &Db, w: &mut DbWriter, pubkey: &PubKey) -> Res /// Create WotId pub fn create_wot_id(db: &Db, w: &mut DbWriter) -> Result<WotId, DbError> { let next_wot_id = if let Some(DbValue::U64(next_wot_id)) = db - .get_int_store(CURRENT_METAS_DATAS) + .get_int_store(CURRENT_METADATA) .get(w.as_ref(), CurrentMetaDataKey::NextWotId.to_u32())? { next_wot_id @@ -65,7 +65,7 @@ pub fn create_wot_id(db: &Db, w: &mut DbWriter) -> Result<WotId, DbError> { 0u64 }; - db.get_int_store(CURRENT_METAS_DATAS).put( + db.get_int_store(CURRENT_METADATA).put( w.as_mut(), CurrentMetaDataKey::NextWotId.to_u32(), &DbValue::U64(next_wot_id + 1), diff --git a/lib/modules/blockchain/bc-db-writer/src/indexes/transactions.rs b/lib/modules/blockchain/bc-db-writer/src/indexes/transactions.rs index 05317b87..aafeb6d9 100644 --- a/lib/modules/blockchain/bc-db-writer/src/indexes/transactions.rs +++ b/lib/modules/blockchain/bc-db-writer/src/indexes/transactions.rs @@ -154,7 +154,7 @@ pub fn apply_and_write_tx( .collect::<Result<HashMap<UniqueIdUTXOv10, TransactionOutput>, DbError>>()?; let consumed_sources_bytes = durs_dbs_tools::to_bytes(&consumed_sources)?; let block_number = - durs_bc_db_reader::current_meta_datas::get_current_blockstamp(&BcDbRwWithWriter { + durs_bc_db_reader::current_metadata::get_current_blockstamp(&BcDbRwWithWriter { db, w, })? @@ -218,7 +218,7 @@ mod tests { use super::*; use dubp_common_doc::traits::{Document, DocumentBuilder}; use dubp_common_doc::BlockHash; - use durs_bc_db_reader::current_meta_datas::CurrentMetaDataKey; + use durs_bc_db_reader::current_metadata::CurrentMetaDataKey; use durs_bc_db_reader::indexes::sources::SourceAmount; use std::str::FromStr; @@ -294,7 +294,7 @@ mod tests { hash: BlockHash(Hash::default()), } .into(); - db.get_int_store(CURRENT_METAS_DATAS).put( + db.get_int_store(CURRENT_METADATA).put( w.as_mut(), CurrentMetaDataKey::CurrentBlockstamp.to_u32(), &DbValue::Blob(&new_current_blockstamp_bytes), diff --git a/lib/modules/blockchain/bc-db-writer/src/lib.rs b/lib/modules/blockchain/bc-db-writer/src/lib.rs index 74462a32..cf3296b7 100644 --- a/lib/modules/blockchain/bc-db-writer/src/lib.rs +++ b/lib/modules/blockchain/bc-db-writer/src/lib.rs @@ -31,7 +31,7 @@ extern crate log; pub mod blocks; -pub mod current_meta_datas; +pub mod current_metadata; pub mod indexes; pub mod writers; diff --git a/lib/modules/blockchain/bc-db-writer/src/writers/requests.rs b/lib/modules/blockchain/bc-db-writer/src/writers/requests.rs index c640d12f..537c1408 100644 --- a/lib/modules/blockchain/bc-db-writer/src/writers/requests.rs +++ b/lib/modules/blockchain/bc-db-writer/src/writers/requests.rs @@ -67,7 +67,7 @@ impl BlocksDBsWriteQuery { BlocksDBsWriteQuery::WriteBlock(mut block_db) => { trace!("BlocksDBsWriteQuery::WriteBlock..."); block_db.block.reduce(); - crate::current_meta_datas::update_current_meta_datas(db, w, &block_db.block)?; + crate::current_metadata::update_current_metadata(db, w, &block_db.block)?; if sync_target.is_none() || block_db.blockstamp().id.0 + fork_window_size as u32 >= sync_target.expect("safe unwrap").id.0 diff --git a/lib/modules/blockchain/blockchain/src/dbex.rs b/lib/modules/blockchain/blockchain/src/dbex.rs index d08b5943..fb8e4c38 100644 --- a/lib/modules/blockchain/blockchain/src/dbex.rs +++ b/lib/modules/blockchain/blockchain/src/dbex.rs @@ -142,7 +142,7 @@ pub fn dbex_bc(profile_path: PathBuf, _csv: bool, _query: DbExBcQuery) -> Result ); if let Some(current_blockstamp) = - db.r(|db_r| durs_bc_db_reader::current_meta_datas::get_current_blockstamp(db_r))? + db.r(|db_r| durs_bc_db_reader::current_metadata::get_current_blockstamp(db_r))? { println!("Current block: #{}.", current_blockstamp); if let Some(current_block) = db.r(|db_r| { @@ -210,7 +210,7 @@ pub fn dbex_fork_tree(profile_path: PathBuf, _csv: bool) { load_db_duration.subsec_millis() ); let fork_tree = db - .r(|db_r| durs_bc_db_reader::current_meta_datas::get_fork_tree(db_r)) + .r(|db_r| durs_bc_db_reader::current_metadata::get_fork_tree(db_r)) .expect("fail to get fork tree"); // Print all fork branches for (tree_node_id, blockstamp) in fork_tree.get_sheets() { diff --git a/lib/modules/blockchain/blockchain/src/fork/fork_algo.rs b/lib/modules/blockchain/blockchain/src/fork/fork_algo.rs index 2acf65e3..a8f58d27 100644 --- a/lib/modules/blockchain/blockchain/src/fork/fork_algo.rs +++ b/lib/modules/blockchain/blockchain/src/fork/fork_algo.rs @@ -32,7 +32,7 @@ pub fn fork_resolution_algo<DB: BcDbInReadTx>( current_blockstamp: Blockstamp, invalid_blocks: &HashSet<Blockstamp>, ) -> Result<Option<Vec<Blockstamp>>, DbError> { - let current_bc_time = durs_bc_db_reader::current_meta_datas::get_current_common_time_(db)?; + let current_bc_time = durs_bc_db_reader::current_metadata::get_current_common_time_(db)?; debug!( "fork_resolution_algo({}, {})", @@ -122,9 +122,7 @@ mod tests { // Insert mock blocks in forks_dbs db.write(|mut w| { for block in &main_branch { - durs_bc_db_writer::current_meta_datas::update_current_meta_datas( - &db, &mut w, &block, - )?; + durs_bc_db_writer::current_metadata::update_current_metadata(&db, &mut w, &block)?; durs_bc_db_writer::blocks::insert_new_head_block( &db, &mut w, diff --git a/lib/modules/blockchain/blockchain/src/lib.rs b/lib/modules/blockchain/blockchain/src/lib.rs index ea1b9fa3..6f0ec523 100644 --- a/lib/modules/blockchain/blockchain/src/lib.rs +++ b/lib/modules/blockchain/blockchain/src/lib.rs @@ -185,11 +185,11 @@ impl BlockchainModule { ) -> Result<BlockchainModule, DbError> { // Get current blockstamp let current_blockstamp = db - .r(|db_r| durs_bc_db_reader::current_meta_datas::get_current_blockstamp(db_r))? + .r(|db_r| durs_bc_db_reader::current_metadata::get_current_blockstamp(db_r))? .unwrap_or_default(); // Get fork tree - let fork_tree = db.r(|db_r| durs_bc_db_reader::current_meta_datas::get_fork_tree(db_r))?; + let fork_tree = db.r(|db_r| durs_bc_db_reader::current_metadata::get_fork_tree(db_r))?; // Get wot index let wot_index: HashMap<PubKey, WotId> = diff --git a/lib/modules/blockchain/blockchain/src/sync/apply/blocks_worker.rs b/lib/modules/blockchain/blockchain/src/sync/apply/blocks_worker.rs index 1c3e993f..daa7e8e4 100644 --- a/lib/modules/blockchain/blockchain/src/sync/apply/blocks_worker.rs +++ b/lib/modules/blockchain/blockchain/src/sync/apply/blocks_worker.rs @@ -31,7 +31,7 @@ pub fn execute( // Get fork tree let mut fork_tree = db - .r(|db_r| durs_bc_db_reader::current_meta_datas::get_fork_tree(db_r)) + .r(|db_r| durs_bc_db_reader::current_metadata::get_fork_tree(db_r)) .expect("Fail to read DB."); // Listen db requets diff --git a/lib/modules/blockchain/blockchain/src/sync/download/json_reader_worker.rs b/lib/modules/blockchain/blockchain/src/sync/download/json_reader_worker.rs index ba9faceb..f7750ce7 100644 --- a/lib/modules/blockchain/blockchain/src/sync/download/json_reader_worker.rs +++ b/lib/modules/blockchain/blockchain/src/sync/download/json_reader_worker.rs @@ -98,7 +98,7 @@ pub fn json_reader_worker( let db_path = durs_conf::get_blockchain_db_path(profile_path); let db = durs_bc_db_reader::open_db_ro(&db_path).expect("Fail to open DB."); let current_blockstamp = db - .r(|db_r| durs_bc_db_reader::current_meta_datas::get_current_blockstamp(db_r)) + .r(|db_r| durs_bc_db_reader::current_metadata::get_current_blockstamp(db_r)) .expect("get_current_blockstamp: Fail to read DB !") .unwrap_or_default(); info!("Local current blockstamp = {}", current_blockstamp); diff --git a/lib/modules/blockchain/blockchain/src/sync/mod.rs b/lib/modules/blockchain/blockchain/src/sync/mod.rs index 8f3b2795..5afbe642 100644 --- a/lib/modules/blockchain/blockchain/src/sync/mod.rs +++ b/lib/modules/blockchain/blockchain/src/sync/mod.rs @@ -191,7 +191,7 @@ pub fn local_sync<DC: DursConfTrait>( // Get local current blockstamp debug!("Get local current blockstamp..."); let current_blockstamp: Blockstamp = db - .r(|db_r| durs_bc_db_reader::current_meta_datas::get_current_blockstamp(db_r)) + .r(|db_r| durs_bc_db_reader::current_metadata::get_current_blockstamp(db_r)) .expect("DbError : fail to get current blockstamp !") .unwrap_or_default(); debug!("Success to get local current blockstamp."); diff --git a/lib/tests-tools/bc-db-tests-tools/src/mocks.rs b/lib/tests-tools/bc-db-tests-tools/src/mocks.rs index 9f496614..e5742c3b 100644 --- a/lib/tests-tools/bc-db-tests-tools/src/mocks.rs +++ b/lib/tests-tools/bc-db-tests-tools/src/mocks.rs @@ -19,7 +19,7 @@ use dubp_block_doc::BlockDocument; use durs_bc_db_reader::blocks::fork_tree::ForkTree; use durs_bc_db_reader::blocks::BlockDb; use durs_bc_db_writer::blocks::{insert_new_fork_block, insert_new_head_block}; -use durs_bc_db_writer::current_meta_datas::update_current_meta_datas; +use durs_bc_db_writer::current_metadata::update_current_metadata; use durs_bc_db_writer::{Db, DbError}; /// Warning : This function does not update the indexes and considers @@ -32,7 +32,7 @@ pub fn insert_main_block( fork_tree: Option<&mut ForkTree>, ) -> Result<(), DbError> { db_tmp.write(|mut w| { - update_current_meta_datas(db_tmp, &mut w, &block)?; + update_current_metadata(db_tmp, &mut w, &block)?; insert_new_head_block( &db_tmp, &mut w, -- GitLab