diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5323b5f2863e6af92762d107b5dd1c1453f49457..d7e8f9c74f5ccadad216af874c372bfd491584d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,7 +138,7 @@ tests:win64:stable: - cargo test --package durs-network --target=x86_64-pc-windows-gnu - cargo test --package durs-bc-db-reader --target=x86_64-pc-windows-gnu - cargo test --package durs-bc-db-writer --target=x86_64-pc-windows-gnu - - cargo test --package durs-blockchain --target=x86_64-pc-windows-gnu + - cargo test --package durs-bc --target=x86_64-pc-windows-gnu - cargo test --package durs-dbs-tools --target=x86_64-pc-windows-gnu #- cargo test --package durs-skeleton-module --target=x86_64-pc-windows-gnu - cargo test --package durs-gva --target=x86_64-pc-windows-gnu diff --git a/Cargo.lock b/Cargo.lock index 11408c7aefb898e2108a200d4c23348c8208c1be..031b3f4550758c9b421d34b60b4ca6c144ff9ec4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -861,35 +861,47 @@ dependencies = [ ] [[package]] -name = "durs-bc-db-reader" +name = "durs-bc" version = "0.3.0-dev" dependencies = [ + "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "dubp-block-doc 0.1.0", "dubp-blocks-tests-tools 0.1.0", "dubp-common-doc 0.1.0", "dubp-currency-params 0.2.0", - "dubp-indexes 0.1.0", "dubp-user-docs 0.14.0", "dubp-user-docs-tests-tools 0.1.0", "dup-crypto 0.7.0", "dup-crypto-tests-tools 0.1.0", + "durs-bc-db-reader 0.3.0-dev", + "durs-bc-db-writer 0.3.0-dev", "durs-common-tests-tools 0.1.0", "durs-common-tools 0.2.0", "durs-conf 0.3.0-dev", - "durs-dbs-tools 0.1.0-a", + "durs-message 0.3.0-dev", "durs-module 0.3.0-dev", + "durs-network 0.3.0-dev", + "durs-network-documents 0.4.0", "durs-wot 0.8.0-a0.9", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "json-pest-parser 0.2.0", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "mockall 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pbr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rules-engine 0.1.0", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "unwrap 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "durs-bc-db-writer" +name = "durs-bc-db-reader" version = "0.3.0-dev" dependencies = [ "dubp-block-doc 0.1.0", @@ -901,7 +913,6 @@ dependencies = [ "dubp-user-docs-tests-tools 0.1.0", "dup-crypto 0.7.0", "dup-crypto-tests-tools 0.1.0", - "durs-bc-db-reader 0.3.0-dev", "durs-common-tests-tools 0.1.0", "durs-common-tools 0.2.0", "durs-conf 0.3.0-dev", @@ -910,49 +921,38 @@ dependencies = [ "durs-wot 0.8.0-a0.9", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "mockall 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "unwrap 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "durs-blockchain" +name = "durs-bc-db-writer" version = "0.3.0-dev" dependencies = [ - "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "dubp-block-doc 0.1.0", "dubp-blocks-tests-tools 0.1.0", "dubp-common-doc 0.1.0", "dubp-currency-params 0.2.0", + "dubp-indexes 0.1.0", "dubp-user-docs 0.14.0", "dubp-user-docs-tests-tools 0.1.0", "dup-crypto 0.7.0", "dup-crypto-tests-tools 0.1.0", "durs-bc-db-reader 0.3.0-dev", - "durs-bc-db-writer 0.3.0-dev", "durs-common-tests-tools 0.1.0", "durs-common-tools 0.2.0", "durs-conf 0.3.0-dev", - "durs-message 0.3.0-dev", + "durs-dbs-tools 0.1.0-a", "durs-module 0.3.0-dev", - "durs-network 0.3.0-dev", - "durs-network-documents 0.4.0", "durs-wot 0.8.0-a0.9", - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "json-pest-parser 0.2.0", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mockall 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pbr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rules-engine 0.1.0", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "unwrap 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -999,8 +999,8 @@ dependencies = [ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "dubp-currency-params 0.2.0", "dup-crypto 0.7.0", + "durs-bc 0.3.0-dev", "durs-bc-db-reader 0.3.0-dev", - "durs-blockchain 0.3.0-dev", "durs-common-tools 0.2.0", "durs-conf 0.3.0-dev", "durs-dbs-tools 0.1.0-a", diff --git a/lib/core/core/Cargo.toml b/lib/core/core/Cargo.toml index 44757d3020df5a67ef93040b2457adf3ed6fb33b..f418a3db93f6436f1521b4a7add9cccdba8e98ab 100644 --- a/lib/core/core/Cargo.toml +++ b/lib/core/core/Cargo.toml @@ -13,7 +13,7 @@ path = "src/lib.rs" chrono = "0.4" clear_on_drop = "0.2.3" dirs = "1.0.2" -durs-blockchain = { path = "../../modules/blockchain/blockchain" } +durs-bc = { path = "../../modules/blockchain/blockchain" } durs-common-tools = { path = "../../tools/common-tools" } durs-bc-db-reader = { path = "../../modules-lib/bc-db-reader" } durs-conf = { path = "../conf" } diff --git a/lib/core/core/src/commands/dbex.rs b/lib/core/core/src/commands/dbex.rs index 148bcba6252cc53809c67ddb2cad86a15fc03f6b..f406bb754ed43e665dd45b2fbe37c6e651745dd9 100644 --- a/lib/core/core/src/commands/dbex.rs +++ b/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::dbex::{DbExBcQuery, DbExQuery, DbExTxQuery, DbExWotQuery}; +use durs_bc::dbex::{DbExBcQuery, DbExQuery, DbExTxQuery, DbExWotQuery}; use durs_conf::DuRsConf; #[derive(StructOpt, Debug, Clone)] diff --git a/lib/core/core/src/lib.rs b/lib/core/core/src/lib.rs index 2708250ccbde1c94760c8abcbabc87ed118c934c..d14249e42794f8a721b4632e047a2d4639ef8617 100644 --- a/lib/core/core/src/lib.rs +++ b/lib/core/core/src/lib.rs @@ -42,7 +42,7 @@ mod router; use crate::commands::*; use crate::errors::DursCoreError; use dubp_currency_params::CurrencyName; -use durs_blockchain::{dbex::DbExQuery, BlockchainModule}; +use durs_bc::{dbex::DbExQuery, BlockchainModule}; use durs_common_tools::fatal_error; pub use durs_conf::{ constants::KEYPAIRS_FILENAME, keys::*, ChangeGlobalConf, DuRsConf, DuniterKeyPairs, diff --git a/lib/modules/blockchain/blockchain/Cargo.toml b/lib/modules/blockchain/blockchain/Cargo.toml index 278cb2e340d4622557e64dc51f52393e2c51b3b2..90cc03468dcf9502286a1b18890b0cf9cda933c8 100644 --- a/lib/modules/blockchain/blockchain/Cargo.toml +++ b/lib/modules/blockchain/blockchain/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "durs-blockchain" +name = "durs-bc" version = "0.3.0-dev" authors = ["librelois <elois@ifee.fr>"] description = "Blockchain module for the Dunitrust project." diff --git a/lib/modules/blockchain/blockchain/tests/apply_blocks_cautious.rs b/lib/modules/blockchain/blockchain/tests/apply_blocks_cautious.rs index cb2bbbf4e1e80a7258cd2199f9c25e8bc58eea8d..9acd588a4a3ad9eb44566aadf4f59de5e1c41ada 100644 --- a/lib/modules/blockchain/blockchain/tests/apply_blocks_cautious.rs +++ b/lib/modules/blockchain/blockchain/tests/apply_blocks_cautious.rs @@ -18,7 +18,7 @@ mod common; use crate::common::*; use dubp_block_doc::BlockDocument; use dubp_currency_params::genesis_block_params::v10::BlockV10Parameters; -use durs_blockchain::BlockchainModule; +use durs_bc::BlockchainModule; use durs_message::events::{BlockchainEvent, DursEvent}; use durs_message::requests::DursReqContent; use durs_message::DursMsg; diff --git a/lib/modules/blockchain/blockchain/tests/common.rs b/lib/modules/blockchain/blockchain/tests/common.rs index 35e5549d3b61ab16ab5aaaba1a10db0551532bed..29eaf73f91e380254625d2721e539e0a76eeeda5 100644 --- a/lib/modules/blockchain/blockchain/tests/common.rs +++ b/lib/modules/blockchain/blockchain/tests/common.rs @@ -15,8 +15,8 @@ use dubp_currency_params::genesis_block_params::v10::BlockV10Parameters; use dubp_currency_params::{CurrencyName, CurrencyParameters}; +use durs_bc::BlockchainModule; use durs_bc_db_writer::WotsV10DBs; -use durs_blockchain::BlockchainModule; use durs_message::DursMsg; use durs_module::RouterThreadMessage; use std::path::{Path, PathBuf}; diff --git a/lib/modules/blockchain/blockchain/tests/revert_blocks.rs b/lib/modules/blockchain/blockchain/tests/revert_blocks.rs index 734aad9e0413c3f0132043b7a27135420919ccd5..df188ebeb3c7f56f6dca7b98cf6351c8cce6e217 100644 --- a/lib/modules/blockchain/blockchain/tests/revert_blocks.rs +++ b/lib/modules/blockchain/blockchain/tests/revert_blocks.rs @@ -20,7 +20,7 @@ use dubp_block_doc::{block::BlockDocumentTrait, BlockDocument}; use dubp_common_doc::BlockNumber; use dubp_currency_params::genesis_block_params::v10::BlockV10Parameters; use dup_crypto::keys::{KeyPair, Signator, SignatorEnum}; -use durs_blockchain::BlockchainModule; +use durs_bc::BlockchainModule; use durs_message::events::{BlockchainEvent, DursEvent}; use durs_message::requests::DursReqContent; use durs_message::DursMsg;