From 781131b0a54f52d138107267b9a3e7bc60d5a9e2 Mon Sep 17 00:00:00 2001
From: librelois <c@elo.tf>
Date: Tue, 22 Dec 2020 13:26:24 +0100
Subject: [PATCH] [ref] rename crate duniter_dbs_read_ops -> duniter-bc-reader

---
 Cargo.lock                                    | 31 +++++++++----------
 Cargo.toml                                    |  2 +-
 .../Cargo.toml                                |  2 +-
 .../src/lib.rs                                |  0
 rust-libs/duniter-mempools/Cargo.toml         |  2 +-
 rust-libs/duniter-mempools/src/lib.rs         |  4 +--
 rust-libs/duniter-server/Cargo.toml           |  2 +-
 rust-libs/duniter-server/src/lib.rs           |  2 +-
 rust-libs/modules/gva/Cargo.toml              |  1 -
 rust-libs/modules/gva/gql/Cargo.toml          |  2 +-
 .../modules/gva/gql/src/queries/gen_tx.rs     |  6 ++--
 rust-libs/modules/gva/gql/src/queries/uds.rs  |  3 +-
 .../gva/gql/src/queries/utxos_of_script.rs    |  3 +-
 .../duniter-integration-tests/Cargo.toml      |  2 +-
 14 files changed, 28 insertions(+), 34 deletions(-)
 rename rust-libs/{duniter-dbs-read-ops => duniter-bc-reader}/Cargo.toml (94%)
 rename rust-libs/{duniter-dbs-read-ops => duniter-bc-reader}/src/lib.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 9e8e747ac..ea1cb5826 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1062,6 +1062,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "duniter-bc-reader"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "dubp",
+ "duniter-dbs",
+ "resiter",
+ "smallvec",
+]
+
 [[package]]
 name = "duniter-conf"
 version = "0.1.0"
@@ -1118,17 +1129,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "duniter-dbs-read-ops"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "dubp",
- "duniter-dbs",
- "resiter",
- "smallvec",
-]
-
 [[package]]
 name = "duniter-dbs-write-ops"
 version = "0.1.0"
@@ -1156,7 +1156,6 @@ dependencies = [
  "dubp",
  "duniter-conf",
  "duniter-dbs",
- "duniter-dbs-read-ops",
  "duniter-gva-dbs-reader",
  "duniter-gva-gql",
  "duniter-gva-indexer",
@@ -1199,9 +1198,9 @@ dependencies = [
  "async-graphql",
  "async-trait",
  "dubp",
+ "duniter-bc-reader",
  "duniter-conf",
  "duniter-dbs",
- "duniter-dbs-read-ops",
  "duniter-gva-dbs-reader",
  "duniter-mempools",
  "duniter-module",
@@ -1236,9 +1235,9 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "dubp",
+ "duniter-bc-reader",
  "duniter-conf",
  "duniter-dbs",
- "duniter-dbs-read-ops",
  "duniter-dbs-write-ops",
  "duniter-mempools",
  "duniter-module",
@@ -1273,8 +1272,8 @@ name = "duniter-mempools"
 version = "0.1.0"
 dependencies = [
  "dubp",
+ "duniter-bc-reader",
  "duniter-dbs",
- "duniter-dbs-read-ops",
  "duniter-dbs-write-ops",
  "log",
  "thiserror",
@@ -1302,9 +1301,9 @@ dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
  "dubp",
+ "duniter-bc-reader",
  "duniter-conf",
  "duniter-dbs",
- "duniter-dbs-read-ops",
  "duniter-dbs-write-ops",
  "duniter-gva",
  "duniter-mempools",
diff --git a/Cargo.toml b/Cargo.toml
index 66c59c243..0813c6d13 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,7 @@ members = [
     "rust-libs/dubp-wot",
     "rust-libs/duniter-conf",
     "rust-libs/duniter-dbs",
-    "rust-libs/duniter-dbs-read-ops",
+    "rust-libs/duniter-bc-reader",
     "rust-libs/duniter-dbs-write-ops",
     "rust-libs/duniter-mempools",
     "rust-libs/duniter-module",
diff --git a/rust-libs/duniter-dbs-read-ops/Cargo.toml b/rust-libs/duniter-bc-reader/Cargo.toml
similarity index 94%
rename from rust-libs/duniter-dbs-read-ops/Cargo.toml
rename to rust-libs/duniter-bc-reader/Cargo.toml
index 7a64e8b66..0d2f121d8 100644
--- a/rust-libs/duniter-dbs-read-ops/Cargo.toml
+++ b/rust-libs/duniter-bc-reader/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "duniter-dbs-read-ops"
+name = "duniter-bc-reader"
 version = "0.1.0"
 authors = ["elois <elois@duniter.org>"]
 description = "Duniter DBs read operations"
diff --git a/rust-libs/duniter-dbs-read-ops/src/lib.rs b/rust-libs/duniter-bc-reader/src/lib.rs
similarity index 100%
rename from rust-libs/duniter-dbs-read-ops/src/lib.rs
rename to rust-libs/duniter-bc-reader/src/lib.rs
diff --git a/rust-libs/duniter-mempools/Cargo.toml b/rust-libs/duniter-mempools/Cargo.toml
index bd43adfc5..0e0768f0a 100644
--- a/rust-libs/duniter-mempools/Cargo.toml
+++ b/rust-libs/duniter-mempools/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/lib.rs"
 [dependencies]
 dubp = { version = "0.34.0" }
 duniter-dbs = { path = "../duniter-dbs" }
-duniter-dbs-read-ops = { path = "../duniter-dbs-read-ops" }
+duniter-bc-reader = { path = "../duniter-bc-reader" }
 duniter-dbs-write-ops = { path = "../duniter-dbs-write-ops" }
 log = "0.4.11"
 thiserror = "1.0.20"
diff --git a/rust-libs/duniter-mempools/src/lib.rs b/rust-libs/duniter-mempools/src/lib.rs
index 2851b5416..8a8870aae 100644
--- a/rust-libs/duniter-mempools/src/lib.rs
+++ b/rust-libs/duniter-mempools/src/lib.rs
@@ -71,7 +71,7 @@ impl TxsMempool {
         tx: TransactionDocumentV10,
         txs_mp_db_ro: &TxsMpDb,
     ) -> Result<(), TxMpError> {
-        if duniter_dbs_read_ops::tx_exist(bc_db_ro, tx.get_hash())? {
+        if duniter_bc_reader::tx_exist(bc_db_ro, tx.get_hash())? {
             Err(TxMpError::TxAlreadyWritten)
         } else if tx.issuers().contains(&server_pubkey)
             || txs_mp_db_ro.txs().count()? < self.max_size
@@ -89,7 +89,7 @@ impl TxsMempool {
         txs_mp_db: &TxsMpV2Db<B>,
         tx: &TransactionDocumentV10,
     ) -> Result<(), TxMpError> {
-        if duniter_dbs_read_ops::tx_exist(bc_db_ro, tx.get_hash())? {
+        if duniter_bc_reader::tx_exist(bc_db_ro, tx.get_hash())? {
             Err(TxMpError::TxAlreadyWritten)
         } else if tx.issuers().contains(&server_pubkey) {
             duniter_dbs_write_ops::txs_mp::add_pending_tx(
diff --git a/rust-libs/duniter-server/Cargo.toml b/rust-libs/duniter-server/Cargo.toml
index 68fa2d92f..caf74fd9f 100644
--- a/rust-libs/duniter-server/Cargo.toml
+++ b/rust-libs/duniter-server/Cargo.toml
@@ -11,7 +11,7 @@ cfg-if = "1.0.0"
 dubp = { version = "0.34.0" }
 duniter-conf = { path = "../duniter-conf" }
 duniter-dbs = { path = "../duniter-dbs" }
-duniter-dbs-read-ops = { path = "../duniter-dbs-read-ops" }
+duniter-bc-reader = { path = "../duniter-bc-reader" }
 duniter-dbs-write-ops = { path = "../duniter-dbs-write-ops" }
 duniter-gva = { path = "../modules/gva", optional = true }
 duniter-mempools = { path = "../duniter-mempools" }
diff --git a/rust-libs/duniter-server/src/lib.rs b/rust-libs/duniter-server/src/lib.rs
index 13ab976c3..8ed140b67 100644
--- a/rust-libs/duniter-server/src/lib.rs
+++ b/rust-libs/duniter-server/src/lib.rs
@@ -108,7 +108,7 @@ impl DuniterServer {
         shared_dbs.dunp_db.heads_old_write().clear()?; // Clear WS2Pv1 HEADs
         duniter_dbs_write_ops::cm::init(&bc_db, &shared_dbs.cm_db)?;
         log::info!("Databases successfully opened.");
-        let current = duniter_dbs_read_ops::get_current_block_meta(&shared_dbs.cm_db)
+        let current = duniter_bc_reader::get_current_block_meta(&shared_dbs.cm_db)
             .context("Fail to get current")?;
         if let Some(current) = current {
             log::info!("Current block: #{}-{}", current.number, current.hash);
diff --git a/rust-libs/modules/gva/Cargo.toml b/rust-libs/modules/gva/Cargo.toml
index 971f2001c..f4928b033 100644
--- a/rust-libs/modules/gva/Cargo.toml
+++ b/rust-libs/modules/gva/Cargo.toml
@@ -14,7 +14,6 @@ async-trait = "0.1.41"
 dubp = { version = "0.34.0" }
 duniter-conf = { path = "../../duniter-conf" }
 duniter-dbs = { path = "../../duniter-dbs" }
-duniter-dbs-read-ops = { path = "../../duniter-dbs-read-ops" }
 duniter-gva-dbs-reader = { path = "./dbs-reader" }
 duniter-gva-indexer = { path = "./indexer" }
 duniter-gva-gql = { path = "./gql" }
diff --git a/rust-libs/modules/gva/gql/Cargo.toml b/rust-libs/modules/gva/gql/Cargo.toml
index 8adcae235..50472efba 100644
--- a/rust-libs/modules/gva/gql/Cargo.toml
+++ b/rust-libs/modules/gva/gql/Cargo.toml
@@ -13,7 +13,7 @@ async-trait = "0.1.41"
 dubp = { version = "0.34.0" }
 duniter-conf = { path = "../../../duniter-conf" }
 duniter-dbs = { path = "../../../duniter-dbs" }
-duniter-dbs-read-ops = { path = "../../../duniter-dbs-read-ops" }
+duniter-bc-reader = { path = "../../../duniter-bc-reader" }
 duniter-gva-dbs-reader = { path = "../dbs-reader" }
 duniter-mempools = { path = "../../../duniter-mempools" }
 duniter-module = { path = "../../../duniter-module" }
diff --git a/rust-libs/modules/gva/gql/src/queries/gen_tx.rs b/rust-libs/modules/gva/gql/src/queries/gen_tx.rs
index 6b2aea765..85c8e45bb 100644
--- a/rust-libs/modules/gva/gql/src/queries/gen_tx.rs
+++ b/rust-libs/modules/gva/gql/src/queries/gen_tx.rs
@@ -118,8 +118,7 @@ impl GenTxsQuery {
         let (current_block, (inputs, inputs_sum)) = data
             .dbs_pool
             .execute(move |dbs| {
-                if let Some(current_block) =
-                    duniter_dbs_read_ops::get_current_block_meta(&dbs.cm_db)?
+                if let Some(current_block) = duniter_bc_reader::get_current_block_meta(&dbs.cm_db)?
                 {
                     Ok((
                         current_block,
@@ -193,8 +192,7 @@ impl GenTxsQuery {
         let (current_block, issuers_inputs_with_sum) = data
             .dbs_pool
             .execute(move |dbs| {
-                if let Some(current_block) =
-                    duniter_dbs_read_ops::get_current_block_meta(&dbs.cm_db)?
+                if let Some(current_block) = duniter_bc_reader::get_current_block_meta(&dbs.cm_db)?
                 {
                     let mut issuers_inputs_with_sum = Vec::new();
                     for issuer in issuers {
diff --git a/rust-libs/modules/gva/gql/src/queries/uds.rs b/rust-libs/modules/gva/gql/src/queries/uds.rs
index 60ccc284e..c375ff2bd 100644
--- a/rust-libs/modules/gva/gql/src/queries/uds.rs
+++ b/rust-libs/modules/gva/gql/src/queries/uds.rs
@@ -66,8 +66,7 @@ impl UdsQuery {
         ) = data
             .dbs_pool
             .execute(move |dbs| {
-                if let Some(current_block) =
-                    duniter_dbs_read_ops::get_current_block_meta(&dbs.cm_db)?
+                if let Some(current_block) = duniter_bc_reader::get_current_block_meta(&dbs.cm_db)?
                 {
                     let paged_data = match filter {
                         UdsFilter::All => {
diff --git a/rust-libs/modules/gva/gql/src/queries/utxos_of_script.rs b/rust-libs/modules/gva/gql/src/queries/utxos_of_script.rs
index 07cb21d0a..9640c50a9 100644
--- a/rust-libs/modules/gva/gql/src/queries/utxos_of_script.rs
+++ b/rust-libs/modules/gva/gql/src/queries/utxos_of_script.rs
@@ -49,8 +49,7 @@ impl UtxosQuery {
         ) = data
             .dbs_pool
             .execute(move |dbs| {
-                if let Some(current_block) =
-                    duniter_dbs_read_ops::get_current_block_meta(&dbs.cm_db)?
+                if let Some(current_block) = duniter_bc_reader::get_current_block_meta(&dbs.cm_db)?
                 {
                     let paged_data = db_reader.find_script_utxos(
                         &dbs.txs_mp_db,
diff --git a/rust-libs/tests/duniter-integration-tests/Cargo.toml b/rust-libs/tests/duniter-integration-tests/Cargo.toml
index 53e6cb20c..84fda6245 100644
--- a/rust-libs/tests/duniter-integration-tests/Cargo.toml
+++ b/rust-libs/tests/duniter-integration-tests/Cargo.toml
@@ -10,7 +10,7 @@ anyhow = "1.0.34"
 dubp = { version = "0.34.0" }
 duniter-conf = { path = "../../duniter-conf" }
 duniter-dbs = { path = "../../duniter-dbs" }
-duniter-dbs-read-ops = { path = "../../duniter-dbs-read-ops" }
+duniter-bc-reader = { path = "../../duniter-bc-reader" }
 duniter-dbs-write-ops = { path = "../../duniter-dbs-write-ops" }
 duniter-mempools = { path = "../../duniter-mempools" }
 duniter-module = { path = "../../duniter-module" }
-- 
GitLab