diff --git a/Cargo.lock b/Cargo.lock
index 206b87e9b0c7937d7e0ed1ce72cfbe69cb75299e..9e8e747ac805565594b3560f6b1f0791c40e2875 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1081,7 +1081,7 @@ dependencies = [
"dubp",
"duniter-dbs",
"duniter-dbs-write-ops",
- "duniter-gva-db-writer",
+ "duniter-gva-indexer",
"fast-threadpool",
"flume",
"once_cell",
@@ -1157,9 +1157,9 @@ dependencies = [
"duniter-conf",
"duniter-dbs",
"duniter-dbs-read-ops",
- "duniter-gva-db-writer",
"duniter-gva-dbs-reader",
"duniter-gva-gql",
+ "duniter-gva-indexer",
"duniter-mempools",
"duniter-module",
"fast-threadpool",
@@ -1177,19 +1177,6 @@ dependencies = [
"warp",
]
-[[package]]
-name = "duniter-gva-db-writer"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "dubp",
- "duniter-dbs",
- "maplit",
- "once_cell",
- "resiter",
- "smallvec",
-]
-
[[package]]
name = "duniter-gva-dbs-reader"
version = "0.1.0"
@@ -1230,6 +1217,19 @@ dependencies = [
"unwrap",
]
+[[package]]
+name = "duniter-gva-indexer"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "dubp",
+ "duniter-dbs",
+ "maplit",
+ "once_cell",
+ "resiter",
+ "smallvec",
+]
+
[[package]]
name = "duniter-integration-tests"
version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index e005e19a6800f51950376b85a63c3f7bba7b8136..66c59c2430ebbc7b7e2c482b47f24588bb47f7a0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,8 +43,8 @@ members = [
"rust-libs/duniter-server",
"rust-libs/modules/gva",
"rust-libs/modules/gva/dbs-reader",
- "rust-libs/modules/gva/db-writer",
"rust-libs/modules/gva/gql",
+ "rust-libs/modules/gva/indexer",
"rust-libs/tests/duniter-integration-tests",
"rust-libs/tools/kv_typed"
]
diff --git a/rust-bins/duniter-dbex/Cargo.toml b/rust-bins/duniter-dbex/Cargo.toml
index e9d355e6ea9a19d792b00d3919f12c59658f0e7a..c0b2ce05fd1dfd12e09e39cd2f634b375d9fe688 100644
--- a/rust-bins/duniter-dbex/Cargo.toml
+++ b/rust-bins/duniter-dbex/Cargo.toml
@@ -25,7 +25,7 @@ dirs = "3.0.1"
dubp = { version = "0.34.0" }
duniter-dbs = { path = "../../rust-libs/duniter-dbs", default-features = false, features = ["explorer", "leveldb_backend", "sled_backend"] }
duniter-dbs-write-ops = { path = "../../rust-libs/duniter-dbs-write-ops", default-features = false, features = ["explorer", "leveldb_backend", "sled_backend"] }
-duniter-gva-db-writer = { path = "../../rust-libs/modules/gva/db-writer" }
+duniter-gva-indexer = { path = "../../rust-libs/modules/gva/indexer" }
fast-threadpool = "0.2.3"
flume = "0.10.0"
once_cell = "1.5.2"
diff --git a/rust-bins/duniter-dbex/src/migrate.rs b/rust-bins/duniter-dbex/src/migrate.rs
index 65a76b96b722f7c6d95f55745bd4f95ad4ad9013..d88dfd6bbc51438299b65f627ef3b5c121f272b2 100644
--- a/rust-bins/duniter-dbex/src/migrate.rs
+++ b/rust-bins/duniter-dbex/src/migrate.rs
@@ -27,7 +27,7 @@ const CHUNK_SIZE: usize = 250;
pub(crate) fn migrate(profile_path: PathBuf) -> anyhow::Result<()> {
let start_time = Instant::now();
let (bc_db, shared_dbs) = duniter_dbs::open_dbs(Some(profile_path.as_path()))?;
- let gva_db = duniter_gva_db_writer::get_gva_db_rw(Some(profile_path.as_path()));
+ let gva_db = duniter_gva_indexer::get_gva_db_rw(Some(profile_path.as_path()));
// Clear bc_db and gva_db
bc_db.clear()?;
@@ -113,7 +113,7 @@ fn migrate_inner(
let gva_handle = dbs_pool
.launch(move |_| {
for block in chunk_arc_clone.deref() {
- duniter_gva_db_writer::apply_block(block, gva_db)?;
+ duniter_gva_indexer::apply_block(block, gva_db)?;
}
Ok::<_, KvError>(())
})
diff --git a/rust-libs/modules/gva/Cargo.toml b/rust-libs/modules/gva/Cargo.toml
index b5f58e116d2a0a3b4fff66eecfde8853b4eea411..971f2001c0c614a10b7c3198e1ed281057179564 100644
--- a/rust-libs/modules/gva/Cargo.toml
+++ b/rust-libs/modules/gva/Cargo.toml
@@ -16,7 +16,7 @@ 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-db-writer = { path = "./db-writer" }
+duniter-gva-indexer = { path = "./indexer" }
duniter-gva-gql = { path = "./gql" }
duniter-mempools = { path = "../../duniter-mempools" }
duniter-module = { path = "../../duniter-module" }
diff --git a/rust-libs/modules/gva/db-writer/Cargo.toml b/rust-libs/modules/gva/indexer/Cargo.toml
similarity index 95%
rename from rust-libs/modules/gva/db-writer/Cargo.toml
rename to rust-libs/modules/gva/indexer/Cargo.toml
index ff254bd64f42e024a559c39ada2ddf98a914b33f..5747bdc661dd490b74c347a8a3a72227b49dcfeb 100644
--- a/rust-libs/modules/gva/db-writer/Cargo.toml
+++ b/rust-libs/modules/gva/indexer/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "duniter-gva-db-writer"
+name = "duniter-gva-indexer"
version = "0.1.0"
authors = ["elois <elois@duniter.org>"]
description = "Duniter GVA DB writer"
diff --git a/rust-libs/modules/gva/db-writer/src/identities.rs b/rust-libs/modules/gva/indexer/src/identities.rs
similarity index 100%
rename from rust-libs/modules/gva/db-writer/src/identities.rs
rename to rust-libs/modules/gva/indexer/src/identities.rs
diff --git a/rust-libs/modules/gva/db-writer/src/lib.rs b/rust-libs/modules/gva/indexer/src/lib.rs
similarity index 100%
rename from rust-libs/modules/gva/db-writer/src/lib.rs
rename to rust-libs/modules/gva/indexer/src/lib.rs
diff --git a/rust-libs/modules/gva/db-writer/src/tx.rs b/rust-libs/modules/gva/indexer/src/tx.rs
similarity index 100%
rename from rust-libs/modules/gva/db-writer/src/tx.rs
rename to rust-libs/modules/gva/indexer/src/tx.rs
diff --git a/rust-libs/modules/gva/db-writer/src/utxos.rs b/rust-libs/modules/gva/indexer/src/utxos.rs
similarity index 100%
rename from rust-libs/modules/gva/db-writer/src/utxos.rs
rename to rust-libs/modules/gva/indexer/src/utxos.rs
diff --git a/rust-libs/modules/gva/src/lib.rs b/rust-libs/modules/gva/src/lib.rs
index e6c32a49e7f5e159f6f67746f397d22bf60db788..f08943affefd1048d3a261f8f3817563c1add5b6 100644
--- a/rust-libs/modules/gva/src/lib.rs
+++ b/rust-libs/modules/gva/src/lib.rs
@@ -38,8 +38,8 @@ use duniter_dbs::databases::{
};
use duniter_dbs::prelude::*;
use duniter_dbs::{kv_typed::prelude::*, FileBackend, TxDbV2};
-use duniter_gva_db_writer::{get_gva_db_ro, get_gva_db_rw};
use duniter_gva_gql::GvaSchema;
+use duniter_gva_indexer::{get_gva_db_ro, get_gva_db_rw};
use duniter_mempools::Mempools;
use futures::{StreamExt, TryStreamExt};
use std::{convert::Infallible, path::Path};
@@ -66,7 +66,7 @@ impl duniter_module::DuniterModule for GvaModule {
profile_path_opt: Option<&Path>,
) -> KvResult<()> {
let gva_db = get_gva_db_rw(profile_path_opt);
- duniter_gva_db_writer::apply_block(&block, gva_db)
+ duniter_gva_indexer::apply_block(&block, gva_db)
}
fn revert_block(
block: &DubpBlockV10,
@@ -74,7 +74,7 @@ impl duniter_module::DuniterModule for GvaModule {
profile_path_opt: Option<&Path>,
) -> KvResult<()> {
let gva_db = get_gva_db_rw(profile_path_opt);
- duniter_gva_db_writer::revert_block(&block, gva_db)
+ duniter_gva_indexer::revert_block(&block, gva_db)
}
fn init(
conf: &duniter_conf::DuniterConf,