diff --git a/lib/core/conf/Cargo.toml b/lib/core/conf/Cargo.toml index 2bf012712eb495c8048bc0c16acd2837431c512f..d051703407a421219cabd2ed6728bf83bca2310c 100644 --- a/lib/core/conf/Cargo.toml +++ b/lib/core/conf/Cargo.toml @@ -12,7 +12,7 @@ path = "src/lib.rs" [dependencies] dirs = "1.0.2" dup-crypto = { path = "../../crypto" } -dup-currency-params = { path = "../../dubp/currency-params" } +dubp-currency-params = { path = "../../dubp/currency-params" } dubp-documents= { path = "../../dubp/documents" } durs-module = { path = "../module" } durs-common-tools = { path = "../../tools/common-tools" } diff --git a/lib/core/conf/src/lib.rs b/lib/core/conf/src/lib.rs index b043e451e8500006866458cadaf060256cc06010..cee360ccb00ecee0c94a9fb6d704c1d65b76c307 100644 --- a/lib/core/conf/src/lib.rs +++ b/lib/core/conf/src/lib.rs @@ -36,8 +36,8 @@ pub mod constants; pub mod keys; use crate::constants::MODULES_DATAS_FOLDER; +use dubp_currency_params::CurrencyName; use dup_crypto::keys::*; -use dup_currency_params::CurrencyName; use durs_common_tools::fatal_error; use durs_module::{ DursConfTrait, DursGlobalConfTrait, ModuleName, RequiredKeys, RequiredKeysContent, diff --git a/lib/core/core/Cargo.toml b/lib/core/core/Cargo.toml index eae608962b3358d7f2eff1360ec4d92038ea8e35..891f5b32519a04dd97c212ff3c925027a66cc2c9 100644 --- a/lib/core/core/Cargo.toml +++ b/lib/core/core/Cargo.toml @@ -15,7 +15,7 @@ durs-blockchain = { path = "../../modules/blockchain/blockchain" } durs-common-tools = { path = "../../tools/common-tools" } durs-conf = { path = "../conf" } dup-crypto = { path = "../../crypto" } -dup-currency-params = { path = "../../dubp/currency-params" } +dubp-currency-params = { path = "../../dubp/currency-params" } durs-message = { path = "../message" } durs-module = { path = "../module" } durs-network = { path = "../network" } diff --git a/lib/core/core/src/errors.rs b/lib/core/core/src/errors.rs index fac900408d01adde10051a334a5be501b31620d8..80d353745582a1287b5452fcbf9730c92bf859d8 100644 --- a/lib/core/core/src/errors.rs +++ b/lib/core/core/src/errors.rs @@ -16,7 +16,7 @@ //! Manage Dunitrust core errors. use crate::logger::InitLoggerError; -use dup_currency_params::db::CurrencyParamsDbError; +use dubp_currency_params::db::CurrencyParamsDbError; use durs_module::{ModuleStaticName, PlugModuleError}; use failure::{Error, Fail}; diff --git a/lib/core/core/src/lib.rs b/lib/core/core/src/lib.rs index 58337d23e56aa13dfdd15d50c9bd1188138d6532..cb07c8d01ff989a677b27492e5ac50d31669ec71 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::constants::DEFAULT_USER_PROFILE; use crate::errors::DursCoreError; -use dup_currency_params::CurrencyName; +use dubp_currency_params::CurrencyName; use durs_blockchain::{BlockchainModule, DBExQuery}; use durs_common_tools::fatal_error; pub use durs_conf::{ @@ -261,7 +261,7 @@ impl DursCore<DuRsConf> { info!("Success to load global conf."); // Get currency name - let currency_name = dup_currency_params::db::get_currency_name(durs_conf::get_datas_path( + let currency_name = dubp_currency_params::db::get_currency_name(durs_conf::get_datas_path( profile_path.clone(), )) .map_err(DursCoreError::FailReadCurrencyParamsDb)?; diff --git a/lib/core/message/Cargo.toml b/lib/core/message/Cargo.toml index 89a8615c4fcd43129f855ee28d404d5a1bed3496..6494bc931ea81315a96300c5477ef15a9dc46632 100644 --- a/lib/core/message/Cargo.toml +++ b/lib/core/message/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" [dependencies] dup-crypto = { path = "../../crypto" } -dup-currency-params = { path = "../../dubp/currency-params" } +dubp-currency-params = { path = "../../dubp/currency-params" } dubp-documents= { path = "../../dubp/documents" } durs-module = { path = "../module" } durs-network = { path = "../network" } diff --git a/lib/core/message/src/events.rs b/lib/core/message/src/events.rs index 632872b0e02caf46c5794f15383cab53102feb2b..f3b9df2e47331c84d2381c1f6024a4ffab18fa6e 100644 --- a/lib/core/message/src/events.rs +++ b/lib/core/message/src/events.rs @@ -47,7 +47,7 @@ pub enum MemPoolEvent { /// Blockchain module events pub enum BlockchainEvent { /// Currency parameters - CurrencyParameters(dup_currency_params::CurrencyParameters), + CurrencyParameters(dubp_currency_params::CurrencyParameters), /// Stack up new valid block in local blockchain StackUpValidBlock(Box<BlockDocument>), /// Revert blocks in local blockchain diff --git a/lib/core/module/Cargo.toml b/lib/core/module/Cargo.toml index 1c047373c289b76610424fbf22d7c1b90a05a2cc..dba78f8455dc3c45409e4aa0432cabb29ca62ba1 100644 --- a/lib/core/module/Cargo.toml +++ b/lib/core/module/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" [dependencies] dup-crypto = { path = "../../crypto" } -dup-currency-params = { path = "../../dubp/currency-params" } +dubp-currency-params = { path = "../../dubp/currency-params" } dubp-documents = { path = "../../dubp/documents" } durs-common-tools = { path = "../../tools/common-tools" } durs-network-documents = { path = "../../dunp/network-documents" } diff --git a/lib/core/module/src/lib.rs b/lib/core/module/src/lib.rs index 2259fdcd45939b2384f6e8fe7ed018f4c95f4ced..d0a09fd3d2c9870d8f3404e085c96107f6b80d4e 100644 --- a/lib/core/module/src/lib.rs +++ b/lib/core/module/src/lib.rs @@ -31,8 +31,8 @@ #[macro_use] extern crate serde_derive; +use dubp_currency_params::CurrencyName; use dup_crypto::keys::{KeyPair, KeyPairEnum}; -use dup_currency_params::CurrencyName; use durs_common_tools::fatal_error; use durs_common_tools::traits::merge::Merge; use durs_network_documents::network_endpoint::{ApiPart, EndpointEnum}; diff --git a/lib/dubp/documents/src/documents/block/v10.rs b/lib/dubp/documents/src/documents/block/v10.rs index 2834d9d9f9e8ab6a20685983fe9a01780beb7c47..2a30f30292659513bd66a30b2a535ab17862b245 100644 --- a/lib/dubp/documents/src/documents/block/v10.rs +++ b/lib/dubp/documents/src/documents/block/v10.rs @@ -15,10 +15,10 @@ //! Wrappers around Block document V10. -use dup_crypto::hashs::Hash; -use dup_crypto::keys::*; use dubp_currency_params::genesis_block_params::v10::BlockV10Parameters; use dubp_currency_params::CurrencyName; +use dup_crypto::hashs::Hash; +use dup_crypto::keys::*; use durs_common_tools::fatal_error; use std::ops::Deref; use unwrap::unwrap; diff --git a/lib/dubp/documents/src/parsers/blocks.rs b/lib/dubp/documents/src/parsers/blocks.rs index 0aee4e58d199a567cb08a8540cf54458db591a75..5070a5f3ef570ff83f983f102e4ed290e5ef587c 100644 --- a/lib/dubp/documents/src/parsers/blocks.rs +++ b/lib/dubp/documents/src/parsers/blocks.rs @@ -17,11 +17,11 @@ use crate::documents::block::{v10::TxDocOrTxHash, BlockDocument, BlockDocumentV1 use crate::documents::membership::v10::MembershipType; use crate::parsers::{serde_json_value_to_pest_json_value, DefaultHasher}; use crate::*; +use dubp_currency_params::genesis_block_params::v10::BlockV10Parameters; +use dubp_currency_params::CurrencyName; use dup_crypto::bases::BaseConvertionError; use dup_crypto::hashs::Hash; use dup_crypto::keys::*; -use dubp_currency_params::genesis_block_params::v10::BlockV10Parameters; -use dubp_currency_params::CurrencyName; use failure::Error; use json_pest_parser::*; use std::str::FromStr; diff --git a/lib/dunp/network-documents/Cargo.toml b/lib/dunp/network-documents/Cargo.toml index 91050a9734c5a85eae3163072c865972a251ee51..755dd902f36fa6bb5a6492d02099bc93d1741f1b 100644 --- a/lib/dunp/network-documents/Cargo.toml +++ b/lib/dunp/network-documents/Cargo.toml @@ -15,7 +15,7 @@ path = "src/lib.rs" base58 = "0.1.*" durs-common-tools = { path = "../../tools/common-tools" } dup-crypto = { path = "../../crypto" } -dup-currency-params = { path = "../../dubp/currency-params" } +dubp-currency-params = { path = "../../dubp/currency-params" } dubp-documents= { path = "../../dubp/documents" } failure = "0.1.5" hex = "0.3.*" diff --git a/lib/dunp/network-documents/src/network_head_v3.rs b/lib/dunp/network-documents/src/network_head_v3.rs index 095bf15e5d3007aa53723480b3f28c1f1b5402f9..17d7ab26e26ad003f13566cf1a42ca64570f941c 100644 --- a/lib/dunp/network-documents/src/network_head_v3.rs +++ b/lib/dunp/network-documents/src/network_head_v3.rs @@ -18,11 +18,11 @@ use crate::network_head::NetworkHead; use crate::*; use base58::ToBase58; +use dubp_currency_params::CurrencyName; use dubp_documents::blockstamp::Blockstamp; use dubp_documents::{BlockHash, BlockNumber, ToStringObject}; use dup_crypto::keys::text_signable::TextSignable; use dup_crypto::keys::*; -use dup_currency_params::CurrencyName; use pest::iterators::Pair; use pest::Parser; use std::cmp::Ordering; diff --git a/lib/dunp/network-documents/src/network_peer.rs b/lib/dunp/network-documents/src/network_peer.rs index cf2a61506738663e5c7a3053aa715e6d754d7357..851495dc88a94276ed72b81c2c48191f1acef68a 100644 --- a/lib/dunp/network-documents/src/network_peer.rs +++ b/lib/dunp/network-documents/src/network_peer.rs @@ -18,12 +18,12 @@ use crate::network_endpoint::*; use crate::*; use base58::ToBase58; +use dubp_currency_params::CurrencyName; use dubp_documents::blockstamp::Blockstamp; use dubp_documents::BlockNumber; use dubp_documents::ToStringObject; use dup_crypto::keys::text_signable::TextSignable; use dup_crypto::keys::*; -use dup_currency_params::CurrencyName; use pest::iterators::Pair; use pest::Parser; diff --git a/lib/modules/blockchain/blockchain-dal/Cargo.toml b/lib/modules/blockchain/blockchain-dal/Cargo.toml index 94f86603f4e2bfdc41e85aef28ccb02be09483f2..536a7da69ea2850895b292a364e311d4fa8a040b 100644 --- a/lib/modules/blockchain/blockchain-dal/Cargo.toml +++ b/lib/modules/blockchain/blockchain-dal/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" [dependencies] dup-crypto = { path = "../../../crypto" } -dup-currency-params = { path = "../../../dubp/currency-params" } +dubp-currency-params = { path = "../../../dubp/currency-params" } dubp-documents= { path = "../../../dubp/documents" } durs-conf = { path = "../../../core/conf" } durs-module = { path = "../../../core/module" } diff --git a/lib/modules/blockchain/blockchain-dal/src/entities/fork_tree.rs b/lib/modules/blockchain/blockchain-dal/src/entities/fork_tree.rs index 409e4cfc8568debbe3008eea05435dea52ffe7c2..4a0f630315be49c513092f6b1ef81a5b52330bec 100644 --- a/lib/modules/blockchain/blockchain-dal/src/entities/fork_tree.rs +++ b/lib/modules/blockchain/blockchain-dal/src/entities/fork_tree.rs @@ -123,7 +123,7 @@ pub struct ForkTree { impl Default for ForkTree { #[inline] fn default() -> Self { - ForkTree::new(*dup_currency_params::constants::DEFAULT_FORK_WINDOW_SIZE) + ForkTree::new(*dubp_currency_params::constants::DEFAULT_FORK_WINDOW_SIZE) } } @@ -451,7 +451,7 @@ impl ForkTree { mod tests { use super::*; - use dup_currency_params::constants::DEFAULT_FORK_WINDOW_SIZE; + use dubp_currency_params::constants::DEFAULT_FORK_WINDOW_SIZE; #[test] fn insert_root_nodes() { diff --git a/lib/modules/blockchain/blockchain-dal/src/readers/currency_params.rs b/lib/modules/blockchain/blockchain-dal/src/readers/currency_params.rs index df471f6bacffd0ff16c57e28e60fa083608329b4..f061dab2af46785092c308171a7c37c90653f807 100644 --- a/lib/modules/blockchain/blockchain-dal/src/readers/currency_params.rs +++ b/lib/modules/blockchain/blockchain-dal/src/readers/currency_params.rs @@ -14,11 +14,11 @@ // along with this program. If not, see <https://www.gnu.org/licenses/>. use crate::*; +use dubp_currency_params::db::write_currency_params; +use dubp_currency_params::genesis_block_params::GenesisBlockParams; +use dubp_currency_params::CurrencyParameters; use dubp_documents::documents::block::{BlockDocument, BlockDocumentTrait}; use dubp_documents::Document; -use dup_currency_params::db::write_currency_params; -use dup_currency_params::genesis_block_params::GenesisBlockParams; -use dup_currency_params::CurrencyParameters; use unwrap::unwrap; /// Get and write currency params diff --git a/lib/modules/blockchain/blockchain-dal/src/writers/certification.rs b/lib/modules/blockchain/blockchain-dal/src/writers/certification.rs index 28ce123470da3421be9b487fabe99aecd7a7b949..a42cecb8c2c91175c98d9d4145a84229e086d8f5 100644 --- a/lib/modules/blockchain/blockchain-dal/src/writers/certification.rs +++ b/lib/modules/blockchain/blockchain-dal/src/writers/certification.rs @@ -14,10 +14,10 @@ // along with this program. If not, see <https://www.gnu.org/licenses/>. use crate::{BinDB, CertsExpirV10Datas, DALError, IdentitiesV10Datas}; +use dubp_currency_params::CurrencyParameters; use dubp_documents::documents::certification::CompactCertificationDocumentV10; use dubp_documents::BlockNumber; use dup_crypto::keys::*; -use dup_currency_params::CurrencyParameters; use durs_wot::NodeId; /// Apply "certification" event in databases diff --git a/lib/modules/blockchain/blockchain-dal/src/writers/fork_tree.rs b/lib/modules/blockchain/blockchain-dal/src/writers/fork_tree.rs index 8deb8469fa20f8f70a8671be48f0d015573c8737..d26b3810132de58f230b5da6b505162ff9a0ec46 100644 --- a/lib/modules/blockchain/blockchain-dal/src/writers/fork_tree.rs +++ b/lib/modules/blockchain/blockchain-dal/src/writers/fork_tree.rs @@ -90,7 +90,7 @@ mod test { use super::*; use crate::entities::fork_tree::TreeNodeId; - use dup_currency_params::constants::DEFAULT_FORK_WINDOW_SIZE; + use dubp_currency_params::constants::DEFAULT_FORK_WINDOW_SIZE; #[test] fn test_insert_new_head_block() -> Result<(), DALError> { diff --git a/lib/modules/blockchain/blockchain-dal/src/writers/identity.rs b/lib/modules/blockchain/blockchain-dal/src/writers/identity.rs index dabc089d762d0bcd58ecba500a1acd04727d053d..8db1a90fe5d0ce0febb94638c5421bf188830744 100644 --- a/lib/modules/blockchain/blockchain-dal/src/writers/identity.rs +++ b/lib/modules/blockchain/blockchain-dal/src/writers/identity.rs @@ -15,11 +15,11 @@ use crate::entities::identity::{DALIdentity, DALIdentityState}; use crate::{BinDB, DALError, IdentitiesV10Datas, MsExpirV10Datas}; +use dubp_currency_params::CurrencyParameters; use dubp_documents::documents::identity::IdentityDocumentV10; use dubp_documents::Document; use dubp_documents::{BlockNumber, Blockstamp}; use dup_crypto::keys::PubKey; -use dup_currency_params::CurrencyParameters; use durs_common_tools::fatal_error; use durs_wot::NodeId; diff --git a/lib/modules/blockchain/blockchain-dal/src/writers/requests.rs b/lib/modules/blockchain/blockchain-dal/src/writers/requests.rs index 43d7b4e9d44ec4947e72dc3f229887e63e6ddfaf..1fcb68f99873ffc0fc6a521772afab72ad30203e 100644 --- a/lib/modules/blockchain/blockchain-dal/src/writers/requests.rs +++ b/lib/modules/blockchain/blockchain-dal/src/writers/requests.rs @@ -17,12 +17,12 @@ use crate::entities::block::DALBlock; use crate::entities::sources::SourceAmount; use crate::writers::transaction::DALTxV10; use crate::*; +use dubp_currency_params::CurrencyParameters; use dubp_documents::documents::block::{BlockDocument, BlockDocumentTrait}; use dubp_documents::documents::certification::CompactCertificationDocumentV10; use dubp_documents::documents::identity::IdentityDocumentV10; use dubp_documents::Blockstamp; use dup_crypto::keys::PubKey; -use dup_currency_params::CurrencyParameters; use durs_wot::NodeId; use std::ops::Deref; diff --git a/lib/modules/blockchain/blockchain/Cargo.toml b/lib/modules/blockchain/blockchain/Cargo.toml index af7ba0fe0ce466bb4469f6dfdd72b95059c7f558..5c2cad60aa0430bda98ddae9fa11713fb3b41efa 100644 --- a/lib/modules/blockchain/blockchain/Cargo.toml +++ b/lib/modules/blockchain/blockchain/Cargo.toml @@ -13,7 +13,7 @@ path = "src/lib.rs" dirs = "1.0.2" durs-conf = { path = "../../../core/conf" } dup-crypto = { path = "../../../crypto" } -dup-currency-params = { path = "../../../dubp/currency-params" } +dubp-currency-params = { path = "../../../dubp/currency-params" } durs-blockchain-dal = { path = "../blockchain-dal" } dubp-documents= { path = "../../../dubp/documents" } durs-common-tools = { path = "../../../tools/common-tools" } diff --git a/lib/modules/blockchain/blockchain/src/dbex.rs b/lib/modules/blockchain/blockchain/src/dbex.rs index 46bc32809bd260a949a0f8f357be2b91a29a1dc3..ebe8c92b5a86e3b741ec6cc8f79af2ca6ee2152e 100644 --- a/lib/modules/blockchain/blockchain/src/dbex.rs +++ b/lib/modules/blockchain/blockchain/src/dbex.rs @@ -172,7 +172,7 @@ pub fn dbex_wot(profile_path: PathBuf, csv: bool, query: &DBExWotQuery) { // Get currency parameters let currency_params_db_datas = - dup_currency_params::db::get_currency_params(durs_conf::get_datas_path(profile_path)) + dubp_currency_params::db::get_currency_params(durs_conf::get_datas_path(profile_path)) .expect("Fail to parse currency params !"); if currency_params_db_datas.is_none() { println!("{}", EMPTY_BLOCKCHAIN); diff --git a/lib/modules/blockchain/blockchain/src/fork/fork_algo.rs b/lib/modules/blockchain/blockchain/src/fork/fork_algo.rs index dbf93d5bbe58019794c0bece2fc02b70a33e8b67..bb42224034ca3ccda10ee03c024088cd6ff334b3 100644 --- a/lib/modules/blockchain/blockchain/src/fork/fork_algo.rs +++ b/lib/modules/blockchain/blockchain/src/fork/fork_algo.rs @@ -107,7 +107,7 @@ mod tests { #[test] fn test_fork_resolution_algo() -> Result<(), DALError> { // Get FORK_WINDOW_SIZE value - let fork_window_size = *dup_currency_params::constants::DEFAULT_FORK_WINDOW_SIZE; + let fork_window_size = *dubp_currency_params::constants::DEFAULT_FORK_WINDOW_SIZE; // Open empty databases in memory mode let bc_dbs = BlocksV10DBs::open(None); diff --git a/lib/modules/blockchain/blockchain/src/lib.rs b/lib/modules/blockchain/blockchain/src/lib.rs index 600324c7698ea885916a41244ef89fe51f3a6f7d..34d6c67a0e342164f8f5668a6dd2604c26f05463 100644 --- a/lib/modules/blockchain/blockchain/src/lib.rs +++ b/lib/modules/blockchain/blockchain/src/lib.rs @@ -54,10 +54,10 @@ pub use crate::dbex::{DBExQuery, DBExTxQuery, DBExWotQuery}; use crate::dubp::apply::ValidBlockApplyReqs; use crate::dubp::*; use crate::fork::*; +use dubp_currency_params::{CurrencyName, CurrencyParameters}; use dubp_documents::documents::block::BlockDocument; use dubp_documents::*; use dup_crypto::keys::*; -use dup_currency_params::{CurrencyName, CurrencyParameters}; use durs_blockchain_dal::*; use durs_common_tools::fatal_error; use durs_message::events::*; @@ -199,7 +199,7 @@ impl BlockchainModule { // Get currency parameters let (currency_name, currency_params) = if let Some((currency_name, currency_params)) = - dup_currency_params::db::get_currency_params(durs_conf::get_datas_path( + dubp_currency_params::db::get_currency_params(durs_conf::get_datas_path( profile_path.clone(), )) .expect("Fatal error : fail to read Blockchain DB !") diff --git a/lib/modules/blockchain/blockchain/src/sync/apply/mod.rs b/lib/modules/blockchain/blockchain/src/sync/apply/mod.rs index f30356cd5009d782601921e4b118a74180111b9d..227fce996a1bf652700c077b0470d8a55ffcaec1 100644 --- a/lib/modules/blockchain/blockchain/src/sync/apply/mod.rs +++ b/lib/modules/blockchain/blockchain/src/sync/apply/mod.rs @@ -21,10 +21,10 @@ use crate::dubp; use crate::dubp::apply::apply_valid_block; use crate::dubp::apply::ValidBlockApplyReqs; use crate::sync::SyncJobsMess; +use dubp_currency_params::{CurrencyName, CurrencyParameters}; use dubp_documents::documents::block::{BlockDocument, BlockDocumentTrait}; use dubp_documents::{BlockNumber, Blockstamp, Document}; use dup_crypto::keys::PubKey; -use dup_currency_params::{CurrencyName, CurrencyParameters}; use durs_blockchain_dal::writers::requests::WotsDBsWriteQuery; use durs_blockchain_dal::{BinDB, CertsExpirV10Datas, WotsV10DBs}; use durs_common_tools::fatal_error; diff --git a/lib/modules/blockchain/blockchain/src/sync/mod.rs b/lib/modules/blockchain/blockchain/src/sync/mod.rs index e0496e5a4c81a88c5377dc49d672af4ab70c5b00..24473a8702be4ca372b5702d6d1b9c6a9e2bc886 100644 --- a/lib/modules/blockchain/blockchain/src/sync/mod.rs +++ b/lib/modules/blockchain/blockchain/src/sync/mod.rs @@ -18,10 +18,10 @@ mod download; use crate::*; use apply::BlockApplicator; +use dubp_currency_params::{CurrencyName, CurrencyParameters}; use dubp_documents::documents::block::BlockDocumentTrait; use dubp_documents::{BlockHash, BlockNumber}; use dup_crypto::keys::*; -use dup_currency_params::{CurrencyName, CurrencyParameters}; use durs_blockchain_dal::writers::requests::*; use durs_blockchain_dal::{open_memory_db, CertsExpirV10Datas}; use durs_common_tools::fatal_error; @@ -302,7 +302,7 @@ pub fn local_sync<DC: DursConfTrait>( ); } else { block_applicator.currency_params = - match dup_currency_params::db::get_currency_params(datas_path) { + match dubp_currency_params::db::get_currency_params(datas_path) { Ok(Some((_currency_name, currency_params))) => Some(currency_params), Ok(None) => { fatal_error!("Params db corrupted: please reset data and resync !") diff --git a/lib/modules/skeleton/Cargo.toml b/lib/modules/skeleton/Cargo.toml index 447f9e7a9cf8472b61fbe44de2df58fb93917c1b..f6757caf4656bcc3425bcc58b02f8498fe5135e6 100644 --- a/lib/modules/skeleton/Cargo.toml +++ b/lib/modules/skeleton/Cargo.toml @@ -16,7 +16,7 @@ durs-message = { path = "../../core/message" } durs-module = { path = "../../core/module" } durs-network = { path = "../../core/network" } dup-crypto = { path = "../../crypto" } -dup-currency-params = { path = "../../dubp/currency-params" } +dubp-currency-params = { path = "../../dubp/currency-params" } durs-common-tools = { path = "../../tools/common-tools" } failure = "0.1.5" log = "0.4.*" diff --git a/lib/modules/skeleton/lib.rs b/lib/modules/skeleton/lib.rs index f1467b61fe6b968e60ac28919fed79588fcf9635..01a603b9fc8cd7e94759d3ad0def935f588627c8 100644 --- a/lib/modules/skeleton/lib.rs +++ b/lib/modules/skeleton/lib.rs @@ -34,7 +34,7 @@ extern crate serde_derive; #[macro_use] extern crate structopt; -use dup_currency_params::CurrencyName; +use dubp_currency_params::CurrencyName; use durs_common_tools::fatal_error; use durs_common_tools::traits::merge::Merge; use durs_conf::DuRsConf; diff --git a/lib/modules/tui/Cargo.toml b/lib/modules/tui/Cargo.toml index e3764c8b765c9fdfc4363906f2bbc33e38581f9c..8d23e982361f32d5323d2bf00644c786725466fa 100644 --- a/lib/modules/tui/Cargo.toml +++ b/lib/modules/tui/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] durs-conf = { path = "../../core/conf" } dup-crypto = { path = "../../crypto" } -dup-currency-params = { path = "../../dubp/currency-params" } +dubp-currency-params = { path = "../../dubp/currency-params" } dubp-documents= { path = "../../dubp/documents" } durs-common-tools = { path = "../../tools/common-tools" } durs-message = { path = "../../core/message" } diff --git a/lib/modules/tui/lib.rs b/lib/modules/tui/lib.rs index 926f72b3802c912bdc6d8965ca523decaa6d0325..b75333dfbc0183f6fb92773311679309d9634e5c 100644 --- a/lib/modules/tui/lib.rs +++ b/lib/modules/tui/lib.rs @@ -35,7 +35,7 @@ extern crate serde_derive; #[macro_use] extern crate structopt; -use dup_currency_params::CurrencyName; +use dubp_currency_params::CurrencyName; use durs_common_tools::fatal_error; use durs_common_tools::traits::merge::Merge; use durs_conf::DuRsConf; diff --git a/lib/modules/ws2p-v1-legacy/Cargo.toml b/lib/modules/ws2p-v1-legacy/Cargo.toml index e862090a6b8fc56feeba89e631121556941eaa3e..e749c815d6c30910fab24936b0cf25ccbadffb2b 100644 --- a/lib/modules/ws2p-v1-legacy/Cargo.toml +++ b/lib/modules/ws2p-v1-legacy/Cargo.toml @@ -17,7 +17,7 @@ durs-conf = { path = "../../core/conf" } durs-module = { path = "../../core/module" } durs-network = { path = "../../core/network" } dup-crypto = { path = "../../crypto" } -dup-currency-params = { path = "../../dubp/currency-params" } +dubp-currency-params = { path = "../../dubp/currency-params" } durs-network-documents = { path = "../../dunp/network-documents" } durs-message = { path = "../../core/message" } durs-common-tools = { path = "../../tools/common-tools" } diff --git a/lib/modules/ws2p-v1-legacy/src/lib.rs b/lib/modules/ws2p-v1-legacy/src/lib.rs index 3b1dcd9deabc0f9e1a9c5c4b75602a73942b8c9f..b57126be8c4ae468675b80230e0f6fb9804cd2ea 100644 --- a/lib/modules/ws2p-v1-legacy/src/lib.rs +++ b/lib/modules/ws2p-v1-legacy/src/lib.rs @@ -58,11 +58,11 @@ use crate::ws_connections::messages::WS2Pv1Msg; use crate::ws_connections::requests::{WS2Pv1ReqBody, WS2Pv1ReqFullId, WS2Pv1ReqId, WS2Pv1Request}; use crate::ws_connections::states::WS2PConnectionState; use crate::ws_connections::*; +use dubp_currency_params::CurrencyName; use dubp_documents::documents::block::BlockDocument; use dubp_documents::documents::UserDocumentDUBP; use dubp_documents::Blockstamp; use dup_crypto::keys::*; -use dup_currency_params::CurrencyName; use durs_common_tools::fatal_error; use durs_common_tools::traits::merge::Merge; use durs_conf::DuRsConf; diff --git a/lib/modules/ws2p/ws2p-messages/Cargo.toml b/lib/modules/ws2p/ws2p-messages/Cargo.toml index 7d342d207689be0960eb52298cc55e4131adf04a..fea5797172de4e518531820b21794b208ca86be7 100644 --- a/lib/modules/ws2p/ws2p-messages/Cargo.toml +++ b/lib/modules/ws2p/ws2p-messages/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" bincode = "1.0.*" byteorder = "1.2.3" dup-crypto = { path = "../../../crypto" } -dup-currency-params = { path = "../../../dubp/currency-params" } +dubp-currency-params = { path = "../../../dubp/currency-params" } dubp-documents= { path = "../../../dubp/documents" } durs-network-documents = { path = "../../../dunp/network-documents" } durs-common-tools = { path = "../../../tools/common-tools" } diff --git a/lib/modules/ws2p/ws2p-messages/lib.rs b/lib/modules/ws2p/ws2p-messages/lib.rs index be160b16b343ac30544e9e7a4b6f41d484b365a3..1441f460fce7b0b66965144e55147f8a72d7ac85 100644 --- a/lib/modules/ws2p/ws2p-messages/lib.rs +++ b/lib/modules/ws2p/ws2p-messages/lib.rs @@ -166,11 +166,11 @@ mod tests { use crate::v2::WS2Pv2Message; use bincode; use bincode::{deserialize, serialize}; + use dubp_currency_params::CurrencyName; use dubp_documents::documents::certification::*; use dubp_documents::{BlockNumber, Blockstamp}; use dup_crypto::keys::bin_signable::BinSignable; use dup_crypto::keys::*; - use dup_currency_params::CurrencyName; use durs_network_documents::network_endpoint::*; use durs_network_documents::network_peer::*; use durs_network_documents::*; diff --git a/lib/modules/ws2p/ws2p-messages/v2/mod.rs b/lib/modules/ws2p/ws2p-messages/v2/mod.rs index 1bf5cb0b1ed94c1792cdadc4b06efb6a0afa6d43..d7b7a77fcdfe4fc00fc19c72f12653888faef911 100644 --- a/lib/modules/ws2p/ws2p-messages/v2/mod.rs +++ b/lib/modules/ws2p/ws2p-messages/v2/mod.rs @@ -30,10 +30,10 @@ pub mod secret_flags; use crate::v2::payload_container::*; use crate::WS2PMessage; +use dubp_currency_params::CurrencyName; use dup_crypto::hashs::Hash; use dup_crypto::keys::bin_signable::BinSignable; use dup_crypto::keys::*; -use dup_currency_params::CurrencyName; use durs_network_documents::NodeId; /// WS2P v2 message metadata size diff --git a/lib/modules/ws2p/ws2p-protocol/Cargo.toml b/lib/modules/ws2p/ws2p-protocol/Cargo.toml index b6065611a4f7bb962964d0328a6569684b60ef81..50df6ef8de3634d76717f347653e172fdd289603 100644 --- a/lib/modules/ws2p/ws2p-protocol/Cargo.toml +++ b/lib/modules/ws2p/ws2p-protocol/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" [dependencies] dup-crypto = { path = "../../../crypto" } -dup-currency-params = { path = "../../../dubp/currency-params" } +dubp-currency-params = { path = "../../../dubp/currency-params" } durs-common-tools = { path = "../../../tools/common-tools" } dubp-documents= { path = "../../../dubp/documents" } durs-module = { path = "../../../core/module" } diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs index 49a28e9df3a15606a30f0b5991bab8f8858ea9ca..25166ab3abc4b955b5b1a9eb4bc5523a0c556c05 100644 --- a/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs +++ b/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs @@ -17,9 +17,9 @@ use crate::connection_state::WS2PConnectionState; use crate::MySelfWs2pNode; +use dubp_currency_params::CurrencyName; use dubp_documents::Blockstamp; use dup_crypto::hashs::Hash; -use dup_currency_params::CurrencyName; use durs_network_documents::network_peer::PeerCardV11; use durs_network_documents::NodeFullId; use durs_ws2p_messages::v2::api_features::WS2PFeatures; diff --git a/lib/modules/ws2p/ws2p/Cargo.toml b/lib/modules/ws2p/ws2p/Cargo.toml index 8b3aebf553f0cab8293231cafc52cec34a6368f4..b7fad25993127d64383e09c915c4a58c82f57a2f 100644 --- a/lib/modules/ws2p/ws2p/Cargo.toml +++ b/lib/modules/ws2p/ws2p/Cargo.toml @@ -13,7 +13,7 @@ path = "src/lib.rs" bincode = "1.0.*" durs-conf= { path = "../../../core/conf" } dup-crypto = { path = "../../../crypto" } -dup-currency-params = { path = "../../../dubp/currency-params" } +dubp-currency-params = { path = "../../../dubp/currency-params" } dubp-documents= { path = "../../../dubp/documents" } durs-network-documents = { path = "../../../dunp/network-documents" } durs-common-tools = { path = "../../../tools/common-tools" } diff --git a/lib/modules/ws2p/ws2p/src/controllers/incoming_connections.rs b/lib/modules/ws2p/ws2p/src/controllers/incoming_connections.rs index fd65fd4971efde93fd9cb040ba920ad64259ce15..d3e306d1cc82e071105fe281edf9a09a893f04c8 100644 --- a/lib/modules/ws2p/ws2p/src/controllers/incoming_connections.rs +++ b/lib/modules/ws2p/ws2p/src/controllers/incoming_connections.rs @@ -17,7 +17,7 @@ use crate::controllers::handler::Ws2pConnectionHandler; use crate::controllers::*; -use dup_currency_params::CurrencyName; +use dubp_currency_params::CurrencyName; use durs_common_tools::fatal_error; use durs_message::DursMsg; use durs_ws2p_messages::v2::connect::WS2Pv2ConnectType; diff --git a/lib/modules/ws2p/ws2p/src/controllers/outgoing_connections.rs b/lib/modules/ws2p/ws2p/src/controllers/outgoing_connections.rs index 7622dc2b5827c5dee9da8a18740bbbccb37475de..dcabd55e52affd675e19ed91e847518f3e0ab21c 100644 --- a/lib/modules/ws2p/ws2p/src/controllers/outgoing_connections.rs +++ b/lib/modules/ws2p/ws2p/src/controllers/outgoing_connections.rs @@ -17,7 +17,7 @@ use crate::controllers::handler::Ws2pConnectionHandler; use crate::controllers::*; -use dup_currency_params::CurrencyName; +use dubp_currency_params::CurrencyName; use durs_common_tools::fatal_error; use durs_message::DursMsg; use durs_network_documents::network_endpoint::EndpointEnum; diff --git a/lib/modules/ws2p/ws2p/src/generate_peer.rs b/lib/modules/ws2p/ws2p/src/generate_peer.rs index 748d7839b343e88f7f6327196d133d332008c846..20de0562e64d5bb832f421b38651aa3f1164db5a 100644 --- a/lib/modules/ws2p/ws2p/src/generate_peer.rs +++ b/lib/modules/ws2p/ws2p/src/generate_peer.rs @@ -16,10 +16,10 @@ //! Generate self peer card use bincode; +use dubp_currency_params::CurrencyName; use dubp_documents::BlockNumber; use dup_crypto::keys::text_signable::TextSignable; use dup_crypto::keys::{KeyPair, KeyPairEnum, SignError}; -use dup_currency_params::CurrencyName; use durs_common_tools::fatal_error; use durs_network_documents::network_endpoint::*; use durs_network_documents::network_peer::*; diff --git a/lib/modules/ws2p/ws2p/src/lib.rs b/lib/modules/ws2p/ws2p/src/lib.rs index 0355f04f08b1ebbbfa6279f8093aa6638617b348..e9d5f71d92c8eadb23dc4d7ed253d82f12155a16 100644 --- a/lib/modules/ws2p/ws2p/src/lib.rs +++ b/lib/modules/ws2p/ws2p/src/lib.rs @@ -40,7 +40,7 @@ mod generate_peer; pub mod services; use crate::errors::WS2PError; -use dup_currency_params::CurrencyName; +use dubp_currency_params::CurrencyName; use durs_common_tools::fatal_error; use durs_common_tools::traits::merge::Merge; use durs_conf::DuRsConf; diff --git a/lib/modules/ws2p/ws2p/src/services/outgoing.rs b/lib/modules/ws2p/ws2p/src/services/outgoing.rs index 7615a5832916621949db6316c120e9a19dd74cbb..3b5546cbbbd29af7a2f8e8041650207e762c15ef 100644 --- a/lib/modules/ws2p/ws2p/src/services/outgoing.rs +++ b/lib/modules/ws2p/ws2p/src/services/outgoing.rs @@ -17,7 +17,7 @@ use crate::services::WsError; use crate::*; -use dup_currency_params::CurrencyName; +use dubp_currency_params::CurrencyName; use durs_network_documents::{NodeFullId, NodeId}; use durs_ws2p_protocol::connection_state::WS2PConnectionState; use durs_ws2p_protocol::controller::WebsocketActionOrder; diff --git a/lib/modules/ws2p/ws2p/tests/connection_negociation.rs b/lib/modules/ws2p/ws2p/tests/connection_negociation.rs index 75141f64474907620c5736b2795c18647b239818..681a0d4a568896a3e6ddc270bae739df30c72281 100644 --- a/lib/modules/ws2p/ws2p/tests/connection_negociation.rs +++ b/lib/modules/ws2p/ws2p/tests/connection_negociation.rs @@ -13,9 +13,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see <https://www.gnu.org/licenses/>. +use dubp_currency_params::CurrencyName; use dup_crypto::keys::KeyPair; use dup_crypto::keys::*; -use dup_currency_params::CurrencyName; //use durs_common_tests_tools::logger::init_logger_stdout; use durs_message::DursMsg; use durs_network_documents::network_endpoint::*; diff --git a/lib/tests-tools/documents-tests-tools/Cargo.toml b/lib/tests-tools/documents-tests-tools/Cargo.toml index b0e5ae910f92566e3a1ea148d420272f772f6ab9..fb2c3cee2cce463102f864fc6050c236011eaf4a 100644 --- a/lib/tests-tools/documents-tests-tools/Cargo.toml +++ b/lib/tests-tools/documents-tests-tools/Cargo.toml @@ -14,7 +14,7 @@ path = "src/lib.rs" [dependencies] dup-crypto = { path = "../../crypto" } -dup-currency-params = { path = "../../dubp/currency-params" } +dubp-currency-params = { path = "../../dubp/currency-params" } dubp-documents = { path = "../../dubp/documents" } dup-crypto-tests-tools = { path = "../crypto-tests-tools" } diff --git a/lib/tests-tools/documents-tests-tools/src/mocks/mod.rs b/lib/tests-tools/documents-tests-tools/src/mocks/mod.rs index 18a189aee25a12bc3d823c80475b76091a7ea01c..0856ef941816db9b74829f061b3a719c9e535f85 100644 --- a/lib/tests-tools/documents-tests-tools/src/mocks/mod.rs +++ b/lib/tests-tools/documents-tests-tools/src/mocks/mod.rs @@ -17,10 +17,10 @@ pub mod identity; +use dubp_currency_params::CurrencyName; use dubp_documents::documents::block::{BlockDocument, BlockDocumentV10}; use dubp_documents::*; use dup_crypto::hashs::Hash; -use dup_currency_params::CurrencyName; /// Generate n mock blockstamps pub fn generate_blockstamps(n: usize) -> Vec<Blockstamp> {