From 5d7270d51fe536ec119318939a1f29d3ba6e085d Mon Sep 17 00:00:00 2001
From: librelois <c@elo.tf>
Date: Wed, 21 Apr 2021 16:45:18 +0200
Subject: [PATCH] [ref] dbs: rename db dunp to network
---
rust-bins/duniter-dbex/src/cli.rs | 4 ++--
rust-bins/duniter-dbex/src/main.rs | 8 ++++----
rust-libs/duniter-dbs/src/databases.rs | 2 +-
.../databases/{dunp_v1.rs => network_v1.rs} | 2 +-
rust-libs/duniter-dbs/src/lib.rs | 6 +++---
rust-libs/duniter-dbs/src/open_dbs.rs | 4 ++--
rust-libs/duniter-server/src/legacy/dunp.rs | 10 +++++-----
rust-libs/duniter-server/src/lib.rs | 2 +-
rust-libs/modules/gva/dbs-reader/src/lib.rs | 10 +++++-----
.../modules/gva/dbs-reader/src/network.rs | 20 +++++++++++--------
.../modules/gva/gql/src/queries/network.rs | 6 +++---
11 files changed, 39 insertions(+), 35 deletions(-)
rename rust-libs/duniter-dbs/src/databases/{dunp_v1.rs => network_v1.rs} (98%)
diff --git a/rust-bins/duniter-dbex/src/cli.rs b/rust-bins/duniter-dbex/src/cli.rs
index 205a07bcc..3f47cdb68 100644
--- a/rust-bins/duniter-dbex/src/cli.rs
+++ b/rust-bins/duniter-dbex/src/cli.rs
@@ -39,7 +39,7 @@ pub struct Opt {
pub enum Database {
BcV1,
BcV2,
- DunpV1,
+ NetworkV1,
GvaV1,
TxsMpV2,
}
@@ -51,7 +51,7 @@ impl FromStr for Database {
match s {
"bc_v1" => Ok(Self::BcV1),
"bc_v2" => Ok(Self::BcV2),
- "dunp_v1" => Ok(Self::DunpV1),
+ "dunp_v1" => Ok(Self::NetworkV1),
"gva_v1" => Ok(Self::GvaV1),
"txs_mp_v2" => Ok(Self::TxsMpV2),
_ => unreachable!(),
diff --git a/rust-bins/duniter-dbex/src/main.rs b/rust-bins/duniter-dbex/src/main.rs
index 00cf5abcd..90cf5770c 100644
--- a/rust-bins/duniter-dbex/src/main.rs
+++ b/rust-bins/duniter-dbex/src/main.rs
@@ -35,7 +35,7 @@ use comfy_table::Table;
use duniter_dbs::databases::{
bc_v1::{BcV1Db, BcV1DbWritable},
bc_v2::{BcV2Db, BcV2DbWritable},
- dunp_v1::{DunpV1Db, DunpV1DbWritable},
+ network_v1::{NetworkV1Db, NetworkV1DbWritable},
txs_mp_v2::{TxsMpV2Db, TxsMpV2DbWritable},
};
use duniter_dbs::kv_typed::prelude::*;
@@ -120,9 +120,9 @@ fn main() -> anyhow::Result<()> {
opt.cmd,
open_db_start_time,
),
- Database::DunpV1 => apply_subcommand(
- DunpV1Db::<Sled>::open(Sled::gen_backend_conf(
- DunpV1Db::<Sled>::NAME,
+ Database::NetworkV1 => apply_subcommand(
+ NetworkV1Db::<Sled>::open(Sled::gen_backend_conf(
+ NetworkV1Db::<Sled>::NAME,
Some(profile_path.as_path()),
))?,
opt.cmd,
diff --git a/rust-libs/duniter-dbs/src/databases.rs b/rust-libs/duniter-dbs/src/databases.rs
index 501375802..19792fc7c 100644
--- a/rust-libs/duniter-dbs/src/databases.rs
+++ b/rust-libs/duniter-dbs/src/databases.rs
@@ -16,5 +16,5 @@
pub mod bc_v1;
pub mod bc_v2;
pub mod cm_v1;
-pub mod dunp_v1;
+pub mod network_v1;
pub mod txs_mp_v2;
diff --git a/rust-libs/duniter-dbs/src/databases/dunp_v1.rs b/rust-libs/duniter-dbs/src/databases/network_v1.rs
similarity index 98%
rename from rust-libs/duniter-dbs/src/databases/dunp_v1.rs
rename to rust-libs/duniter-dbs/src/databases/network_v1.rs
index 87285c022..db55149ae 100644
--- a/rust-libs/duniter-dbs/src/databases/dunp_v1.rs
+++ b/rust-libs/duniter-dbs/src/databases/network_v1.rs
@@ -16,7 +16,7 @@
use crate::*;
db_schema!(
- DunpV1,
+ NetworkV1,
[
["heads_old", HeadsOld, DunpNodeIdV1Db, DunpHeadDbV1],
["peers_old", PeersOld, PubKeyKeyV2, PeerCardDbV1],
diff --git a/rust-libs/duniter-dbs/src/lib.rs b/rust-libs/duniter-dbs/src/lib.rs
index 9b4229e91..63d8a82ad 100644
--- a/rust-libs/duniter-dbs/src/lib.rs
+++ b/rust-libs/duniter-dbs/src/lib.rs
@@ -124,7 +124,7 @@ pub type FileBackend = kv_typed::backend::memory::Mem;
pub struct SharedDbs<B: Backend> {
pub bc_db_ro: databases::bc_v2::BcV2DbRo<B>,
pub cm_db: databases::cm_v1::CmV1Db<MemSingleton>,
- pub dunp_db: databases::dunp_v1::DunpV1Db<B>,
+ pub dunp_db: databases::network_v1::NetworkV1Db<B>,
pub txs_mp_db: databases::txs_mp_v2::TxsMpV2Db<B>,
}
@@ -132,12 +132,12 @@ impl SharedDbs<Mem> {
pub fn mem() -> KvResult<Self> {
use databases::bc_v2::BcV2DbWritable as _;
use databases::cm_v1::CmV1DbWritable as _;
- use databases::dunp_v1::DunpV1DbWritable as _;
+ use databases::network_v1::NetworkV1DbWritable as _;
use databases::txs_mp_v2::TxsMpV2DbWritable as _;
Ok(SharedDbs {
bc_db_ro: databases::bc_v2::BcV2Db::<Mem>::open(MemConf::default())?.get_ro_handler(),
cm_db: databases::cm_v1::CmV1Db::<MemSingleton>::open(MemSingletonConf::default())?,
- dunp_db: databases::dunp_v1::DunpV1Db::<Mem>::open(MemConf::default())?,
+ dunp_db: databases::network_v1::NetworkV1Db::<Mem>::open(MemConf::default())?,
txs_mp_db: databases::txs_mp_v2::TxsMpV2Db::<Mem>::open(MemConf::default())?,
})
}
diff --git a/rust-libs/duniter-dbs/src/open_dbs.rs b/rust-libs/duniter-dbs/src/open_dbs.rs
index af1cdf4da..05f1ffd1b 100644
--- a/rust-libs/duniter-dbs/src/open_dbs.rs
+++ b/rust-libs/duniter-dbs/src/open_dbs.rs
@@ -15,7 +15,7 @@
use crate::databases::bc_v2::BcV2DbWritable as _;
use crate::databases::cm_v1::CmV1DbWritable as _;
-use crate::databases::dunp_v1::DunpV1DbWritable as _;
+use crate::databases::network_v1::NetworkV1DbWritable as _;
use crate::databases::txs_mp_v2::TxsMpV2DbWritable as _;
use crate::*;
@@ -30,7 +30,7 @@ pub fn open_dbs<B: BackendConf>(
bc_db_ro: bc_db.get_ro_handler(),
cm_db: crate::databases::cm_v1::CmV1Db::<MemSingleton>::open(MemSingletonConf::default())
.expect("fail to open CmV1 DB"),
- dunp_db: crate::databases::dunp_v1::DunpV1Db::<B>::open(B::gen_backend_conf(
+ dunp_db: crate::databases::network_v1::NetworkV1Db::<B>::open(B::gen_backend_conf(
"dunp_v1",
profile_path_opt,
))?,
diff --git a/rust-libs/duniter-server/src/legacy/dunp.rs b/rust-libs/duniter-server/src/legacy/dunp.rs
index f77f3e1c3..e390f9e65 100644
--- a/rust-libs/duniter-server/src/legacy/dunp.rs
+++ b/rust-libs/duniter-server/src/legacy/dunp.rs
@@ -32,13 +32,13 @@ impl DuniterServer {
.expect("dbs pool disconnected")
}
pub fn remove_all_peers(&self) -> KvResult<()> {
- use duniter_dbs::databases::dunp_v1::DunpV1DbWritable as _;
+ use duniter_dbs::databases::network_v1::NetworkV1DbWritable as _;
self.dbs_pool
.execute(move |dbs| dbs.dunp_db.peers_old_write().clear())
.expect("dbs pool disconnected")
}
pub fn remove_peer_by_pubkey(&self, pubkey: PublicKey) -> KvResult<()> {
- use duniter_dbs::databases::dunp_v1::DunpV1DbWritable as _;
+ use duniter_dbs::databases::network_v1::NetworkV1DbWritable as _;
self.dbs_pool
.execute(move |dbs| dbs.dunp_db.peers_old_write().remove(PubKeyKeyV2(pubkey)))
.expect("dbs pool disconnected")
@@ -46,7 +46,7 @@ impl DuniterServer {
pub fn save_peer(&self, new_peer_card: PeerCardDbV1) -> anyhow::Result<()> {
use dubp::crypto::keys::PublicKey as _;
let pubkey = PublicKey::from_base58(&new_peer_card.pubkey)?;
- use duniter_dbs::databases::dunp_v1::DunpV1DbWritable as _;
+ use duniter_dbs::databases::network_v1::NetworkV1DbWritable as _;
self.dbs_pool
.execute(move |dbs| {
dbs.dunp_db.peers_old_write().upsert(
@@ -78,7 +78,7 @@ mod tests {
ed25519::{PublicKey, Signature},
PublicKey as _,
};
- use duniter_dbs::databases::dunp_v1::DunpV1DbReadable;
+ use duniter_dbs::databases::network_v1::NetworkV1DbReadable;
use duniter_dbs::PeerCardDbV1;
use super::*;
@@ -113,7 +113,7 @@ mod tests {
#[test]
fn test_save_peer() -> anyhow::Result<()> {
- use duniter_dbs::databases::dunp_v1::DunpV1DbReadable as _;
+ use duniter_dbs::databases::network_v1::NetworkV1DbReadable as _;
let server = DuniterServer::test(DuniterConf::default(), DuniterMode::Start)?;
let dbs = server.get_shared_dbs();
diff --git a/rust-libs/duniter-server/src/lib.rs b/rust-libs/duniter-server/src/lib.rs
index beb1d852d..210932591 100644
--- a/rust-libs/duniter-server/src/lib.rs
+++ b/rust-libs/duniter-server/src/lib.rs
@@ -26,7 +26,7 @@ mod fill_cm;
mod legacy;
pub use duniter_conf::{gva_conf::GvaConf, DuniterConf, DuniterMode};
-use duniter_dbs::databases::dunp_v1::DunpV1DbWritable;
+use duniter_dbs::databases::network_v1::NetworkV1DbWritable;
pub use duniter_dbs::{
kv_typed::prelude::KvResult, smallvec, DunpHeadDbV1, DunpNodeIdV1Db, PeerCardDbV1,
};
diff --git a/rust-libs/modules/gva/dbs-reader/src/lib.rs b/rust-libs/modules/gva/dbs-reader/src/lib.rs
index f297f8d09..8e9cdb33a 100644
--- a/rust-libs/modules/gva/dbs-reader/src/lib.rs
+++ b/rust-libs/modules/gva/dbs-reader/src/lib.rs
@@ -42,7 +42,7 @@ use dubp::documents::transaction::TransactionDocumentV10;
use dubp::{block::DubpBlockV10, common::crypto::hashs::Hash};
use dubp::{common::prelude::BlockNumber, wallet::prelude::*};
use duniter_bca_types::utxo::Utxo;
-use duniter_dbs::{databases::dunp_v1::DunpV1DbReadable, FileBackend};
+use duniter_dbs::{databases::network_v1::NetworkV1DbReadable, FileBackend};
use duniter_dbs::{
databases::{
bc_v2::{BcV2DbReadable, BcV2DbRo},
@@ -86,7 +86,7 @@ pub trait DbsReader {
bc_db: &BcV2DbRo<FileBackend>,
page_info: PageInfo<block::BlockCursor>,
) -> KvResult<PagedData<Vec<(block::BlockCursor, BlockMetaV2)>>>;
- fn endpoints<Db: 'static + DunpV1DbReadable>(
+ fn endpoints<Db: 'static + NetworkV1DbReadable>(
&self,
network_db: &Db,
api_list: Vec<String>,
@@ -153,7 +153,7 @@ pub trait DbsReader {
bc_db: &BcV2DbRo<FileBackend>,
pubkey: PublicKey,
) -> KvResult<Option<duniter_dbs::IdtyDbV2>>;
- fn peers_and_heads<DB: 'static + DunpV1DbReadable>(
+ fn peers_and_heads<DB: 'static + NetworkV1DbReadable>(
&self,
dunp_db: &DB,
) -> KvResult<Vec<(duniter_dbs::PeerCardDbV1, Vec<duniter_dbs::DunpHeadDbV1>)>>;
@@ -196,7 +196,7 @@ impl DbsReader for DbsReaderImpl {
self.blocks_(bc_db, page_info)
}
- fn endpoints<Db: 'static + DunpV1DbReadable>(
+ fn endpoints<Db: 'static + NetworkV1DbReadable>(
&self,
network_db: &Db,
api_list: Vec<String>,
@@ -305,7 +305,7 @@ impl DbsReader for DbsReaderImpl {
self.idty_(bc_db, pubkey)
}
- fn peers_and_heads<DB: 'static + DunpV1DbReadable>(
+ fn peers_and_heads<DB: 'static + NetworkV1DbReadable>(
&self,
dunp_db: &DB,
) -> KvResult<Vec<(duniter_dbs::PeerCardDbV1, Vec<duniter_dbs::DunpHeadDbV1>)>> {
diff --git a/rust-libs/modules/gva/dbs-reader/src/network.rs b/rust-libs/modules/gva/dbs-reader/src/network.rs
index b540e505f..2ec530aa6 100644
--- a/rust-libs/modules/gva/dbs-reader/src/network.rs
+++ b/rust-libs/modules/gva/dbs-reader/src/network.rs
@@ -15,11 +15,11 @@
use crate::*;
use dubp::crypto::keys::PublicKey as _;
-use duniter_dbs::{databases::dunp_v1::DunpV1DbReadable, DunpHeadDbV1, PeerCardDbV1};
+use duniter_dbs::{databases::network_v1::NetworkV1DbReadable, DunpHeadDbV1, PeerCardDbV1};
#[allow(clippy::unnecessary_wraps)]
impl DbsReaderImpl {
- pub(super) fn endpoints_<DB: DunpV1DbReadable>(
+ pub(super) fn endpoints_<DB: NetworkV1DbReadable>(
&self,
network_db: &DB,
mut api_list: Vec<String>,
@@ -43,7 +43,7 @@ impl DbsReaderImpl {
.collect::<Result<Vec<String>, _>>()
})
}
- pub(super) fn peers_and_heads_<DB: DunpV1DbReadable>(
+ pub(super) fn peers_and_heads_<DB: NetworkV1DbReadable>(
&self,
dunp_db: &DB,
) -> KvResult<Vec<(PeerCardDbV1, Vec<DunpHeadDbV1>)>> {
@@ -75,13 +75,14 @@ impl DbsReaderImpl {
#[cfg(test)]
mod tests {
use super::*;
- use duniter_dbs::databases::dunp_v1::DunpV1DbWritable;
+ use duniter_dbs::databases::network_v1::NetworkV1DbWritable;
use duniter_dbs::PeerCardDbV1;
#[test]
fn test_empty_endpoints() -> KvResult<()> {
// Populate DB
- let dunp_db = duniter_dbs::databases::dunp_v1::DunpV1Db::<Mem>::open(MemConf::default())?;
+ let dunp_db =
+ duniter_dbs::databases::network_v1::NetworkV1Db::<Mem>::open(MemConf::default())?;
let db_reader = DbsReaderImpl::mem();
let pk = PublicKey::default();
@@ -103,7 +104,8 @@ mod tests {
let dummy_endpoint = "GVA S domain.tld 443 gva";
// Populate DB
- let dunp_db = duniter_dbs::databases::dunp_v1::DunpV1Db::<Mem>::open(MemConf::default())?;
+ let dunp_db =
+ duniter_dbs::databases::network_v1::NetworkV1Db::<Mem>::open(MemConf::default())?;
let db_reader = DbsReaderImpl::mem();
let pk = PublicKey::default();
let peer = PeerCardDbV1 {
@@ -127,7 +129,8 @@ mod tests {
let dummy_endpoint = "GVA S domain.tld 443 gva";
// Populate DB
- let dunp_db = duniter_dbs::databases::dunp_v1::DunpV1Db::<Mem>::open(MemConf::default())?;
+ let dunp_db =
+ duniter_dbs::databases::network_v1::NetworkV1Db::<Mem>::open(MemConf::default())?;
let db_reader = DbsReaderImpl::mem();
let pk = PublicKey::default();
let peer = PeerCardDbV1 {
@@ -149,7 +152,8 @@ mod tests {
#[test]
fn test_peers_and_heads() -> KvResult<()> {
- let dunp_db = duniter_dbs::databases::dunp_v1::DunpV1Db::<Mem>::open(MemConf::default())?;
+ let dunp_db =
+ duniter_dbs::databases::network_v1::NetworkV1Db::<Mem>::open(MemConf::default())?;
let db_reader = DbsReaderImpl::mem();
let pk = PublicKey::default();
diff --git a/rust-libs/modules/gva/gql/src/queries/network.rs b/rust-libs/modules/gva/gql/src/queries/network.rs
index 25cb150d0..e24be4b4d 100644
--- a/rust-libs/modules/gva/gql/src/queries/network.rs
+++ b/rust-libs/modules/gva/gql/src/queries/network.rs
@@ -68,7 +68,7 @@ impl NetworkQueryInner {
mod tests {
use super::*;
use crate::tests::*;
- use duniter_dbs::databases::dunp_v1::DunpV1Db;
+ use duniter_dbs::databases::network_v1::NetworkV1Db;
use pretty_assertions::assert_eq;
#[tokio::test]
@@ -76,7 +76,7 @@ mod tests {
let mock_cm = MockAsyncAccessor::new();
let mut mock_dbs_reader = MockDbsReader::new();
mock_dbs_reader
- .expect_endpoints::<DunpV1Db<FileBackend>>()
+ .expect_endpoints::<NetworkV1Db<FileBackend>>()
.times(1)
.returning(|_, _| {
Ok(vec![
@@ -105,7 +105,7 @@ mod tests {
async fn test_peers_and_heads() -> anyhow::Result<()> {
let mut dbs_reader = MockDbsReader::new();
dbs_reader
- .expect_peers_and_heads::<DunpV1Db<FileBackend>>()
+ .expect_peers_and_heads::<NetworkV1Db<FileBackend>>()
.times(1)
.returning(|_| {
Ok(vec![(
--
GitLab