[ref] network: rename crate duniter-network -> durs-network

.gitlab-ci.yml

@@ -122,7 +122,7 @@ tests:win64:stable:
     - cargo test --package dubp-documents --target=x86_64-pc-windows-gnu
     - cargo test --package durs-network-documents --target=x86_64-pc-windows-gnu
     - cargo test --package durs-module --target=x86_64-pc-windows-gnu
-    - cargo test --package duniter-network --target=x86_64-pc-windows-gnu
+    - cargo test --package durs-network --target=x86_64-pc-windows-gnu
     - cargo test --package durs-conf --target=x86_64-pc-windows-gnu
     - cargo test --package durs-blockchain-dal --target=x86_64-pc-windows-gnu
     - cargo test --package durs-message --target=x86_64-pc-windows-gnu

Cargo.lock

@@ -285,20 +285,6 @@ dependencies = [
  "dup-crypto-tests-tools 0.1.0",
 ]
 
-[[package]]
-name = "duniter-network"
-version = "0.1.0-a0.1"
-dependencies = [
- "dubp-documents 0.12.0",
- "dup-crypto 0.6.0",
- "durs-module 0.1.0-a0.1",
- "durs-network-documents 0.3.1",
- "serde 1.0.86 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.86 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
- "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "dup-crypto"
 version = "0.6.0"
@@ -326,9 +312,9 @@ dependencies = [
 name = "durs"
 version = "0.1.1-a1"
 dependencies = [
- "duniter-network 0.1.0-a0.1",
  "durs-core 0.1.0-a0.1",
  "durs-module 0.1.0-a0.1",
+ "durs-network 0.1.0-a0.1",
  "durs-tui 0.1.0-a0.1",
  "durs-ws2p 0.1.0-a0.1",
  "durs-ws2p-v1-legacy 0.1.0-a0.1",
@@ -344,7 +330,6 @@ dependencies = [
  "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "dubp-documents 0.12.0",
  "dubp-documents-tests-tools 0.1.0",
- "duniter-network 0.1.0-a0.1",
  "dup-crypto 0.6.0",
  "dup-crypto-tests-tools 0.1.0",
  "durs-blockchain-dal 0.1.0-a0.1",
@@ -352,6 +337,7 @@ dependencies = [
  "durs-conf 0.1.0-a0.1",
  "durs-message 0.1.0-a0.1",
  "durs-module 0.1.0-a0.1",
+ "durs-network 0.1.0-a0.1",
  "durs-network-documents 0.3.1",
  "durs-wot 0.8.0-a0.9",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -416,13 +402,13 @@ name = "durs-core"
 version = "0.1.0-a0.1"
 dependencies = [
  "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "duniter-network 0.1.0-a0.1",
  "dup-crypto 0.6.0",
  "durs-blockchain 0.1.0-a0.1",
  "durs-common-tools 0.1.0",
  "durs-conf 0.1.0-a0.1",
  "durs-message 0.1.0-a0.1",
  "durs-module 0.1.0-a0.1",
+ "durs-network 0.1.0-a0.1",
  "durs-network-documents 0.3.1",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -439,10 +425,10 @@ name = "durs-message"
 version = "0.1.0-a0.1"
 dependencies = [
  "dubp-documents 0.12.0",
- "duniter-network 0.1.0-a0.1",
  "dup-crypto 0.6.0",
  "durs-blockchain-dal 0.1.0-a0.1",
  "durs-module 0.1.0-a0.1",
+ "durs-network 0.1.0-a0.1",
  "durs-network-documents 0.3.1",
  "serde 1.0.86 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.86 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -463,6 +449,20 @@ dependencies = [
  "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "durs-network"
+version = "0.1.0-a0.1"
+dependencies = [
+ "dubp-documents 0.12.0",
+ "dup-crypto 0.6.0",
+ "durs-module 0.1.0-a0.1",
+ "durs-network-documents 0.3.1",
+ "serde 1.0.86 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.86 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "durs-network-documents"
 version = "0.3.1"
@@ -485,12 +485,12 @@ dependencies = [
 name = "durs-skeleton"
 version = "0.1.0"
 dependencies = [
- "duniter-network 0.1.0-a0.1",
  "dup-crypto 0.6.0",
  "durs-common-tools 0.1.0",
  "durs-conf 0.1.0-a0.1",
  "durs-message 0.1.0-a0.1",
  "durs-module 0.1.0-a0.1",
+ "durs-network 0.1.0-a0.1",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.86 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.86 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -503,12 +503,12 @@ name = "durs-tui"
 version = "0.1.0-a0.1"
 dependencies = [
  "dubp-documents 0.12.0",
- "duniter-network 0.1.0-a0.1",
  "dup-crypto 0.6.0",
  "durs-common-tools 0.1.0",
  "durs-conf 0.1.0-a0.1",
  "durs-message 0.1.0-a0.1",
  "durs-module 0.1.0-a0.1",
+ "durs-network 0.1.0-a0.1",
  "durs-network-documents 0.3.1",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.86 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -537,12 +537,12 @@ version = "0.1.0-a0.1"
 dependencies = [
  "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "dubp-documents 0.12.0",
- "duniter-network 0.1.0-a0.1",
  "dup-crypto 0.6.0",
  "durs-common-tools 0.1.0",
  "durs-conf 0.1.0-a0.1",
  "durs-message 0.1.0-a0.1",
  "durs-module 0.1.0-a0.1",
+ "durs-network 0.1.0-a0.1",
  "durs-network-documents 0.3.1",
  "durs-ws2p-messages 0.1.0-a0.1",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -577,12 +577,12 @@ dependencies = [
  "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "dubp-documents 0.12.0",
- "duniter-network 0.1.0-a0.1",
  "dup-crypto 0.6.0",
  "durs-common-tools 0.1.0",
  "durs-conf 0.1.0-a0.1",
  "durs-message 0.1.0-a0.1",
  "durs-module 0.1.0-a0.1",
+ "durs-network 0.1.0-a0.1",
  "durs-network-documents 0.3.1",
  "durs-wot 0.8.0-a0.9",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

bin/durs-server/Cargo.toml

@@ -12,7 +12,7 @@ categories = ["command-line-utilities", "network-programming"]
 edition = "2018"
 
 [dependencies]
-duniter-network = { path = "../../lib/core/network" }
+durs-network = { path = "../../lib/core/network" }
 durs-core = { path = "../../lib/core/core" }
 durs-module = { path = "../../lib/core/module" }
 #durs-skeleton = { path = "../../lib/modules/skeleton" }

bin/durs-server/src/cli.rs

@@ -15,7 +15,6 @@
 
 //! Command line options for classic Durs nodes (no specialization).
 
-use duniter_network::cli::sync::SyncOpt;
 use durs_core::commands::dbex::DbExOpt;
 use durs_core::commands::keys::KeysOpt;
 use durs_core::commands::modules::{DisableOpt, EnableOpt, ListModulesOpt};
@@ -26,6 +25,7 @@ use durs_core::commands::{
 };
 use durs_core::errors::DursCoreError;
 use durs_core::DursCore;
+use durs_network::cli::sync::SyncOpt;
 use durs_ws2p_v1_legacy::{WS2PModule, WS2POpt};
 use log::Level;
 use std::path::PathBuf;

lib/core/core/Cargo.toml

@@ -17,7 +17,7 @@ durs-conf = { path = "../conf" }
 dup-crypto = { path = "../../tools/crypto" }
 durs-message =  { path = "../message" }
 durs-module = { path = "../module" }
-duniter-network = { path = "../network" }
+durs-network = { path = "../network" }
 durs-network-documents = { path = "../../tools/network-documents" }
 failure = "0.1.5"
 log = "0.4.*"

lib/core/core/src/commands/mod.rs

@@ -24,8 +24,8 @@ pub mod start;
 use crate::errors::DursCoreError;
 use crate::DursCore;
 pub use dbex::*;
-pub use duniter_network::cli::sync::SyncOpt;
 use durs_conf::DuRsConf;
+pub use durs_network::cli::sync::SyncOpt;
 pub use keys::KeysOpt;
 use log::Level;
 pub use modules::*;

lib/core/core/src/lib.rs

@@ -42,8 +42,6 @@ mod router;
 use crate::commands::*;
 use crate::constants::DEFAULT_USER_PROFILE;
 use crate::errors::DursCoreError;
-use duniter_network::cli::sync::*;
-use duniter_network::NetworkModule;
 use durs_blockchain::{BlockchainModule, DBExQuery};
 use durs_common_tools::fatal_error;
 pub use durs_conf::{
@@ -51,6 +49,8 @@ pub use durs_conf::{
 };
 use durs_message::*;
 use durs_module::*;
+use durs_network::cli::sync::*;
+use durs_network::NetworkModule;
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::mpsc;

lib/core/message/Cargo.toml

@@ -13,7 +13,7 @@ path = "lib.rs"
 dup-crypto = { path = "../../tools/crypto" }
 dubp-documents= { path = "../../tools/documents" }
 durs-module = { path = "../module" }
-duniter-network = { path = "../network" }
+durs-network = { path = "../network" }
 durs-blockchain-dal = { path = "../../modules/blockchain/blockchain-dal" }
 durs-network-documents = { path = "../../tools/network-documents" }
 serde = "1.0.*"

lib/core/message/events.rs

@@ -17,7 +17,7 @@ use crate::*;
 use dubp_documents::documents::block::BlockDocument;
 use dubp_documents::documents::DUBPDocument;
 use dubp_documents::Blockstamp;
-use duniter_network::events::NetworkEvent;
+use durs_network::events::NetworkEvent;
 
 /// The DURS event message.
 #[derive(Debug, Clone)]

lib/core/message/requests.rs

@@ -15,10 +15,10 @@
 
 use crate::*;
 use dubp_documents::BlockNumber;
-use duniter_network::requests::OldNetworkRequest;
 use dup_crypto::hashs::Hash;
 use dup_crypto::keys::*;
 use durs_blockchain_dal::filters::identities::IdentitiesFilter;
+use durs_network::requests::OldNetworkRequest;
 
 #[derive(Debug, Clone)]
 /// Modules request content

lib/core/message/responses.rs

@@ -20,10 +20,10 @@ use dubp_documents::documents::membership::MembershipDocument;
 use dubp_documents::documents::revocation::RevocationDocument;
 use dubp_documents::BlockNumber;
 use dubp_documents::Blockstamp;
-use duniter_network::requests::NetworkResponse;
 use dup_crypto::hashs::Hash;
 use dup_crypto::keys::*;
 use durs_module::ModuleReqId;
+use durs_network::requests::NetworkResponse;
 use std::collections::HashMap;
 
 /// Durs request response message

lib/core/network/Cargo.toml

 [package]
-name = "duniter-network"
+name = "durs-network"
 version = "0.1.0-a0.1"
 authors = ["librelois <elois@duniter.org>"]
 description = "Network model for the Durs project."

lib/modules/blockchain/blockchain/Cargo.toml

@@ -19,7 +19,7 @@ durs-common-tools = { path = "../../../tools/common-tools" }
 durs-network-documents = { path = "../../../tools/network-documents" }
 durs-message =  { path = "../../../core/message" }
 durs-module = { path = "../../../core/module" }
-duniter-network = { path = "../../../core/network" }
+durs-network = { path = "../../../core/network" }
 durs-wot = { path = "../../../tools/wot" }
 failure = "0.1.5"
 json-pest-parser = { path = "../../../tools/json-pest-parser" }

lib/modules/blockchain/blockchain/src/dunp/queries.rs

@@ -16,10 +16,10 @@
 //! Sub-module that sends requests to the inter-node network layer.
 
 use crate::*;
-use duniter_network::requests::OldNetworkRequest;
 use durs_common_tools::fatal_error;
 use durs_message::*;
 use durs_module::ModuleReqId;
+use durs_network::requests::OldNetworkRequest;
 
 /// Send network request
 pub fn request_network(

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

@@ -56,12 +56,6 @@ use crate::dubp::*;
 use crate::fork::*;
 use dubp_documents::documents::block::BlockDocument;
 use dubp_documents::*;
-use duniter_network::{
-    cli::sync::SyncOpt,
-    documents::BlockchainDocument,
-    events::NetworkEvent,
-    requests::{NetworkResponse, OldNetworkRequest},
-};
 use dup_crypto::keys::*;
 use durs_blockchain_dal::entities::currency_params::CurrencyParameters;
 use durs_blockchain_dal::*;
@@ -71,6 +65,12 @@ use durs_message::requests::*;
 use durs_message::responses::*;
 use durs_message::*;
 use durs_module::*;
+use durs_network::{
+    cli::sync::SyncOpt,
+    documents::BlockchainDocument,
+    events::NetworkEvent,
+    requests::{NetworkResponse, OldNetworkRequest},
+};
 use durs_wot::data::rusty::RustyWebOfTrust;
 use durs_wot::operations::distance::RustyDistanceCalculator;
 use durs_wot::NodeId;

lib/modules/blockchain/blockchain/src/requests/sent.rs

@@ -16,7 +16,7 @@
 //! Sub-module managing the inter-modules requests sent.
 
 use crate::*;
-use duniter_network::requests::OldNetworkRequest;
+use durs_network::requests::OldNetworkRequest;
 
 pub fn request_network_consensus(bc: &mut BlockchainModule) {
     let req = OldNetworkRequest::GetConsensus(ModuleReqFullId(

lib/modules/skeleton/Cargo.toml

@@ -13,7 +13,7 @@ path = "lib.rs"
 durs-conf = { path = "../../core/conf" }
 durs-message =  { path = "../../core/message" }
 durs-module = { path = "../../core/module" }
-duniter-network = { path = "../../core/network" }
+durs-network = { path = "../../core/network" }
 dup-crypto = { path = "../../tools/crypto" }
 durs-common-tools = { path = "../../tools/common-tools" }
 log = "0.4.*"

lib/modules/skeleton/lib.rs

@@ -34,12 +34,12 @@ extern crate serde_derive;
 #[macro_use]
 extern crate structopt;
 
-use duniter_network::events::NetworkEvent;
 use durs_common_tools::fatal_error;
 use durs_conf::DuRsConf;
 use durs_message::events::*;
 use durs_message::*;
 use durs_module::*;
+use durs_network::events::NetworkEvent;
 use std::ops::Deref;
 use std::sync::mpsc;
 use std::thread;

lib/modules/tui/Cargo.toml

@@ -16,7 +16,7 @@ dubp-documents= { path = "../../tools/documents" }
 durs-common-tools = { path = "../../tools/common-tools" }
 durs-message =  { path = "../../core/message" }
 durs-module = { path = "../../core/module" }
-duniter-network = { path = "../../core/network" }
+durs-network = { path = "../../core/network" }
 durs-network-documents = { path = "../../tools/network-documents" }
 log = "0.4.*"
 serde = "1.0.*"

lib/modules/tui/lib.rs

@@ -35,12 +35,12 @@ extern crate serde_derive;
 #[macro_use]
 extern crate structopt;
 
-use duniter_network::events::NetworkEvent;
 use durs_common_tools::fatal_error;
 use durs_conf::DuRsConf;
 use durs_message::events::*;
 use durs_message::*;
 use durs_module::*;
+use durs_network::events::NetworkEvent;
 use durs_network_documents::network_head::NetworkHead;
 use durs_network_documents::NodeFullId;
 use std::collections::HashMap;

lib/modules/ws2p-v1-legacy/Cargo.toml

@@ -15,7 +15,7 @@ byteorder = "1.2.3"
 dubp-documents= { path = "../../tools/documents" }
 durs-conf = { path = "../../core/conf" }
 durs-module = { path = "../../core/module" }
-duniter-network = { path = "../../core/network" }
+durs-network = { path = "../../core/network" }
 dup-crypto = { path = "../../tools/crypto" }
 durs-network-documents = { path = "../../tools/network-documents" }
 durs-message =  { path = "../../core/message" }

lib/modules/ws2p-v1-legacy/src/events/sent.rs

@@ -16,11 +16,11 @@
 //! Sub-module managing the events emitted by the blockchain module.
 
 use crate::WS2PModule;
-use duniter_network::documents::BlockchainDocument;
-use duniter_network::events::NetworkEvent;
 use durs_message::events::DursEvent;
 use durs_message::*;
 use durs_module::{ModuleEvent, RouterThreadMessage};
+use durs_network::documents::BlockchainDocument;
+use durs_network::events::NetworkEvent;
 
 pub fn send_network_events(ws2p_module: &mut WS2PModule, events: Vec<NetworkEvent>) {
     for event in events {

lib/modules/ws2p-v1-legacy/src/lib.rs

@@ -57,11 +57,6 @@ use crate::ws_connections::messages::WS2PConnectionMessage;
 use crate::ws_connections::states::WS2PConnectionState;
 use crate::ws_connections::*;
 use dubp_documents::{Blockstamp, CurrencyName};
-use duniter_network::cli::sync::SyncOpt;
-use duniter_network::documents::*;
-use duniter_network::events::*;
-use duniter_network::requests::*;
-use duniter_network::*;
 use dup_crypto::keys::*;
 use durs_common_tools::fatal_error;
 use durs_conf::DuRsConf;
@@ -70,6 +65,11 @@ use durs_message::requests::*;
 use durs_message::responses::*;
 use durs_message::*;
 use durs_module::*;
+use durs_network::cli::sync::SyncOpt;
+use durs_network::documents::*;
+use durs_network::events::*;
+use durs_network::requests::*;
+use durs_network::*;
 use durs_network_documents::network_endpoint::*;
 use durs_network_documents::network_head::*;
 use durs_network_documents::*;

lib/modules/ws2p-v1-legacy/src/requests/received.rs

@@ -18,8 +18,8 @@
 use crate::ws2p_db::DbEndpoint;
 use crate::ws_connections::states::WS2PConnectionState;
 use crate::WS2PModule;
-use duniter_network::requests::OldNetworkRequest;
 use durs_message::requests::DursReqContent;
+use durs_network::requests::OldNetworkRequest;
 
 pub fn receive_req(ws2p_module: &mut WS2PModule, req_content: &DursReqContent) {
     if let DursReqContent::OldNetworkRequest(ref old_net_request) = *req_content {

lib/modules/ws2p-v1-legacy/src/ws_connections/meta_datas.rs

@@ -19,9 +19,9 @@ use super::messages::WS2PConnectionMessagePayload;
 use super::states::WS2PConnectionState;
 use crate::parsers::blocks::parse_json_block;
 use crate::*;
-use duniter_network::documents::BlockchainDocument;
 use dup_crypto::keys::*;
 use durs_module::ModuleReqId;
+use durs_network::documents::BlockchainDocument;
 use durs_network_documents::network_endpoint::{EndpointV1, NetworkEndpointApi};
 use durs_network_documents::NodeId;
 #[allow(deprecated)]

lib/modules/ws2p-v1-legacy/src/ws_connections/mod.rs

@@ -22,9 +22,9 @@ pub mod requests;
 pub mod states;
 
 use crate::*;
-use duniter_network::documents::BlockchainDocument;
 use dup_crypto::keys::*;
 use durs_module::ModuleReqId;
+use durs_network::documents::BlockchainDocument;
 use durs_network_documents::network_endpoint::EndpointV1;
 use rand::Rng;
 use states::WS2PConnectionState;

lib/modules/ws2p-v1-legacy/src/ws_connections/requests/sent.rs

@@ -16,8 +16,8 @@
 //! Sub-module managing the WS2Pv1 requests sent.
 
 use crate::WS2PModule;
-use duniter_network::requests::OldNetworkRequest;
 use durs_common_tools::fatal_error;
+use durs_network::requests::OldNetworkRequest;
 use durs_network_documents::NodeFullId;
 use std::time::SystemTime;
 use ws::Message;

lib/modules/ws2p/ws2p/Cargo.toml

@@ -19,7 +19,7 @@ durs-common-tools = { path = "../../../tools/common-tools" }
 durs-ws2p-messages = { path = "../ws2p-messages" }
 durs-message= { path = "../../../core/message" }
 durs-module = { path = "../../../core/module" }
-duniter-network = { path = "../../../core/network" }
+durs-network = { path = "../../../core/network" }
 log = "0.4.*"
 serde = "1.0.*"
 serde_derive = "1.0.*"

lib/modules/ws2p/ws2p/src/controllers/incoming_connections/mod.rs

@@ -22,7 +22,7 @@ use crate::controllers::*;
 use crate::services::*;
 use ws::deflate::DeflateBuilder;
 use ws::listen;
-//use duniter_network::*;
+//use durs_network::*;
 use durs_ws2p_messages::v2::connect::WS2Pv2ConnectType;
 use std::sync::mpsc;
 

lib/modules/ws2p/ws2p/src/controllers/outgoing_connections/mod.rs

@@ -24,7 +24,7 @@ use durs_network_documents::network_endpoint::EndpointEnum;
 use durs_network_documents::NodeFullId;
 use ws::connect;
 use ws::deflate::DeflateBuilder;
-//use duniter_network::*;
+//use durs_network::*;
 use durs_ws2p_messages::v2::connect::WS2Pv2ConnectType;
 use std::sync::mpsc;
 

lib/modules/ws2p/ws2p/src/lib.rs

@@ -39,11 +39,11 @@ mod generate_peer;
 pub mod services;
 
 use crate::constants::*;
-use duniter_network::cli::sync::SyncOpt;
-use duniter_network::*;
 use durs_conf::DuRsConf;
 use durs_message::DursMsg;
 use durs_module::*;
+use durs_network::cli::sync::SyncOpt;
+use durs_network::*;
 use durs_network_documents::network_endpoint::*;
 use std::sync::mpsc;
 

lib/modules/ws2p/ws2p/src/services/mod.rs

@@ -16,8 +16,8 @@
 //! WS2P Services
 
 use crate::controllers::*;
-use duniter_network::documents::BlockchainDocument;
 use dup_crypto::keys::KeyPairEnum;
+use durs_network::documents::BlockchainDocument;
 use durs_network_documents::network_head::NetworkHead;
 use durs_network_documents::network_peer::PeerCard;
 use durs_network_documents::*;