[ref] core:dbex: refactor dbex & add blockchain queries

wip

lib/core/core/src/commands/dbex.rs

@@ -19,7 +19,7 @@ use crate::commands::DursExecutableCoreCommand;
 use crate::dbex;
 use crate::errors::DursCoreError;
 use crate::DursCore;
-use durs_blockchain::{DBExQuery, DBExTxQuery, DBExWotQuery};
+use durs_blockchain::dbex::{DbExBcQuery, DbExQuery, DbExTxQuery, DbExWotQuery};
 use durs_conf::DuRsConf;
 
 #[derive(StructOpt, Debug, Clone)]
@@ -70,6 +70,12 @@ pub enum DbExSubCommand {
         raw(setting = "structopt::clap::AppSettings::ColoredHelp")
     )]
     MembersOpt(MembersOpt),
+    /// BlocksOpt
+    #[structopt(
+        name = "blocks",
+        raw(setting = "structopt::clap::AppSettings::ColoredHelp")
+    )]
+    BlocksOpt(BlocksOpt),
 }
 
 #[derive(StructOpt, Debug, Copy, Clone)]
@@ -109,6 +115,10 @@ pub struct BalanceOpt {
     pub address: String,
 }
 
+#[derive(StructOpt, Debug, Copy, Clone)]
+/// BlocksOpt
+pub struct BlocksOpt {}
+
 impl DursExecutableCoreCommand for DbExOpt {
     fn execute(self, durs_core: DursCore<DuRsConf>) -> Result<(), DursCoreError> {
         let profile_path = durs_core.soft_meta_datas.profile_path;
@@ -122,7 +132,7 @@ impl DursExecutableCoreCommand for DbExOpt {
             DbExSubCommand::DistanceOpt(distance_opts) => dbex(
                 profile_path,
                 self.csv,
-                &DBExQuery::WotQuery(DBExWotQuery::AllDistances(distance_opts.reverse)),
+                &DbExQuery::WotQuery(DbExWotQuery::AllDistances(distance_opts.reverse)),
             ),
             DbExSubCommand::ForksOpt(_forks_opts) => {
                 dbex(profile_path, self.csv, &DBExQuery::ForkTreeQuery)
@@ -130,23 +140,28 @@ impl DursExecutableCoreCommand for DbExOpt {
             DbExSubCommand::MemberOpt(member_opts) => dbex(
                 profile_path,
                 self.csv,
-                &DBExQuery::WotQuery(DBExWotQuery::MemberDatas(member_opts.uid)),
+                &DbExQuery::WotQuery(DbExWotQuery::MemberDatas(member_opts.uid)),
             ),
             DbExSubCommand::MembersOpt(members_opts) => {
                 if members_opts.expire {
                     dbex(
                         profile_path,
                         self.csv,
-                        &DBExQuery::WotQuery(DBExWotQuery::ExpireMembers(members_opts.reverse)),
+                        &DbExQuery::WotQuery(DbExWotQuery::ExpireMembers(members_opts.reverse)),
                     );
                 } else {
                     dbex(
                         profile_path,
                         self.csv,
-                        &DBExQuery::WotQuery(DBExWotQuery::ListMembers(members_opts.reverse)),
+                        &DbExQuery::WotQuery(DbExWotQuery::ListMembers(members_opts.reverse)),
                     );
                 }
             }
+            DbExSubCommand::BlocksOpt(_blocks_opts) => dbex(
+                profile_path,
+                self.csv,
+                &DbExQuery::BcQuery(DbExBcQuery::CountBlocksPerIssuer),
+            ),
         }
 
         Ok(())

lib/modules/blockchain/blockchain/src/dbex.rs

@@ -13,6 +13,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+//! Databases explorer
+
 use crate::*;
 use dubp_block_doc::block::BlockDocumentTrait;
 use dubp_common_doc::BlockNumber;
@@ -27,9 +29,23 @@ use unwrap::unwrap;
 pub static EMPTY_BLOCKCHAIN: &'static str =
     "No blockchain, please sync your node to get a blockchain.";
 
+#[derive(Debug, Copy, Clone)]
+/// Query for blockchain databases explorer
+pub enum DbExBcQuery {
+    /// Count blocks per issuer
+    CountBlocksPerIssuer,
+}
+
+#[derive(Debug, Clone)]
+/// Query for tx databases explorer
+pub enum DbExTxQuery {
+    /// Ask balance of an address (pubkey or uid)
+    Balance(String),
+}
+
 #[derive(Debug, Clone)]
 /// Query for wot databases explorer
-pub enum DBExWotQuery {
+pub enum DbExWotQuery {
     /// Ask distance of all members
     AllDistances(bool),
     /// Show members expire date
@@ -40,32 +56,63 @@ pub enum DBExWotQuery {
     MemberDatas(String),
 }
 
-#[derive(Debug, Clone)]
-/// Query for tx databases explorer
-pub enum DBExTxQuery {
-    /// Ask balance of an address (pubkey or uid)
-    Balance(String),
-}
-
 #[derive(Debug, Clone)]
 /// Query for databases explorer
-pub enum DBExQuery {
+pub enum DbExQuery {
+    /// Blockchain query
+    BcQuery(DbExBcQuery),
     /// Fork tree query
     ForkTreeQuery,
     /// Tx query
-    TxQuery(DBExTxQuery),
+    TxQuery(DbExTxQuery),
     /// Wot query
-    WotQuery(DBExWotQuery),
+    WotQuery(DbExWotQuery),
 }
 
+/// Execute DbExQuery
 pub fn dbex(profile_path: PathBuf, csv: bool, query: &DBExQuery) {
     match *query {
         DBExQuery::ForkTreeQuery => dbex_fork_tree(profile_path, csv),
+        DbExQuery::BcQuery(bc_query) => {
+            dbex_bc(profile_path, csv, bc_query).expect("Error: fail to open DB.")
+        }
         DBExQuery::TxQuery(ref tx_query) => dbex_tx(profile_path, csv, tx_query),
         DBExQuery::WotQuery(ref wot_query) => dbex_wot(profile_path, csv, wot_query),
     }
 }
 
+/// Execute DbExBcQuery
+pub fn dbex_bc<DC: DursConfTrait>(
+    profile_path: PathBuf,
+    conf: &DC,
+    _csv: bool,
+    _query: DbExBcQuery,
+) -> Result<(), DALError> {
+    // Get db path
+    let db_path = durs_conf::get_blockchain_db_path(profile_path, &conf.currency());
+
+    // Open databases
+    let load_dbs_begin = SystemTime::now();
+    let blocks_db = BlocksV10DBs::open(Some(&db_path));
+
+    let load_dbs_duration = SystemTime::now()
+        .duration_since(load_dbs_begin)
+        .expect("duration_since error !");
+    println!(
+        "Databases loaded in {}.{:03} seconds.",
+        load_dbs_duration.as_secs(),
+        load_dbs_duration.subsec_millis()
+    );
+
+    if let Some(current_blockstamp) =
+        durs_blockchain_dal::readers::block::get_current_blockstamp(&blocks_db)?
+    {
+        println!("Current block: #{}", current_blockstamp);
+    }
+
+    Ok(())
+}
+
 pub fn dbex_fork_tree(profile_path: PathBuf, _csv: bool) {
     // Get db path
     let db_path = durs_conf::get_blockchain_db_path(profile_path);
@@ -115,7 +162,7 @@ pub fn dbex_tx(profile_path: PathBuf, _csv: bool, query: &DBExTxQuery) {
     );
     let req_process_begin = SystemTime::now();
     match *query {
-        DBExTxQuery::Balance(ref address_str) => {
+        DbExTxQuery::Balance(ref address_str) => {
             let pubkey = if let Ok(ed25519_pubkey) = ed25519::PublicKey::from_base58(address_str) {
                 PubKey::Ed25519(ed25519_pubkey)
             } else if let Some(pubkey) =
@@ -214,7 +261,7 @@ pub fn dbex_wot(profile_path: PathBuf, csv: bool, query: &DBExWotQuery) {
         .len();
 
     match *query {
-        DBExWotQuery::AllDistances(ref reverse) => {
+        DbExWotQuery::AllDistances(ref reverse) => {
             println!("compute distances...");
             let compute_distances_begin = SystemTime::now();
             let mut distances_datas: Vec<(NodeId, WotDistance)> = wot_db
@@ -269,7 +316,7 @@ pub fn dbex_wot(profile_path: PathBuf, csv: bool, query: &DBExWotQuery) {
                 compute_distances_duration.subsec_millis()
             );
         }
-        DBExWotQuery::ExpireMembers(ref reverse) => {
+        DbExWotQuery::ExpireMembers(ref reverse) => {
             // Open blockchain database
             let blockchain_db = open_file_db::<LocalBlockchainV10Datas>(&db_path, "blockchain.db")
                 .expect("Fail to open blockchain db");
@@ -313,7 +360,7 @@ pub fn dbex_wot(profile_path: PathBuf, csv: bool, query: &DBExWotQuery) {
                 println!("{}, {}", wot_uid_index[&node_id], expire_date);
             }
         }
-        DBExWotQuery::MemberDatas(ref uid) => {
+        DbExWotQuery::MemberDatas(ref uid) => {
             println!(" Members count = {}.", members_count);
             if let Some(pubkey) = durs_blockchain_dal::readers::identity::get_pubkey_from_uid(
                 &wot_databases.identities_db,

lib/modules/blockchain/blockchain/src/lib.rs

@@ -34,7 +34,7 @@
 extern crate log;
 
 mod constants;
-mod dbex;
+pub mod dbex;
 mod dubp;
 mod dunp;
 mod events;
@@ -50,7 +50,7 @@ use std::sync::mpsc;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use crate::constants::*;
-pub use crate::dbex::{DBExQuery, DBExTxQuery, DBExWotQuery};
+use crate::dbex::DbExQuery;
 use crate::dubp::apply::ValidBlockApplyReqs;
 use crate::dubp::*;
 use crate::fork::*;