From e0ccd0e4b712aec965dd59981c755bc3923b5578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lo=C3=AFs?= <elois@ifee.fr>
Date: Sun, 11 Nov 2018 19:48:46 +0100
Subject: [PATCH] [ref] rename crate duniter-documents -> dubp-documents
---
Cargo.lock | 54 +++++++++++------------
blockchain/Cargo.toml | 2 +-
blockchain/apply_valid_block.rs | 8 ++--
blockchain/check_and_apply_block.rs | 4 +-
blockchain/dbex.rs | 2 +-
blockchain/lib.rs | 8 ++--
blockchain/revert_block.rs | 6 +--
blockchain/sync.rs | 2 +-
blockchain/ts_parsers.rs | 16 +++----
conf/Cargo.toml | 2 +-
conf/lib.rs | 4 +-
dal/Cargo.toml | 2 +-
dal/block.rs | 6 +--
dal/certs.rs | 4 +-
dal/currency_params.rs | 4 +-
dal/dal_event.rs | 4 +-
dal/dal_requests.rs | 12 ++---
dal/identity.rs | 4 +-
dal/lib.rs | 10 ++---
dal/parsers/certifications.rs | 6 +--
dal/parsers/revoked.rs | 4 +-
dal/sources.rs | 6 +--
dal/writers/block.rs | 4 +-
dal/writers/certification.rs | 4 +-
dal/writers/dividend.rs | 4 +-
dal/writers/identity.rs | 6 +--
dal/writers/requests.rs | 6 +--
dal/writers/transaction.rs | 4 +-
documents/Cargo.toml | 2 +-
documents/README.md | 2 +-
message/Cargo.toml | 2 +-
message/lib.rs | 6 +--
module/Cargo.toml | 2 +-
module/lib.rs | 4 +-
network-documents/Cargo.toml | 2 +-
network-documents/src/lib.rs | 2 +-
network-documents/src/network_endpoint.rs | 2 +-
network-documents/src/network_head.rs | 2 +-
network-documents/src/network_head_v2.rs | 2 +-
network-documents/src/network_head_v3.rs | 4 +-
network-documents/src/network_peer.rs | 6 +--
network/Cargo.toml | 2 +-
network/lib.rs | 18 ++++----
tui/Cargo.toml | 2 +-
tui/lib.rs | 2 +-
ws2p-messages/Cargo.toml | 2 +-
ws2p-messages/lib.rs | 6 +--
ws2p-messages/v2/connect.rs | 4 +-
ws2p-messages/v2/mod.rs | 2 +-
ws2p-messages/v2/ok.rs | 4 +-
ws2p-messages/v2/payload_container.rs | 12 ++---
ws2p-messages/v2/req_responses.rs | 12 ++---
ws2p-messages/v2/requests.rs | 4 +-
ws2p-v1-legacy/Cargo.toml | 2 +-
ws2p-v1-legacy/datas.rs | 2 +-
ws2p-v1-legacy/heads.rs | 2 +-
ws2p-v1-legacy/lib.rs | 8 ++--
ws2p-v1-legacy/parsers/blocks.rs | 10 ++---
ws2p-v1-legacy/parsers/identities.rs | 6 +--
ws2p-v1-legacy/parsers/memberships.rs | 6 +--
ws2p-v1-legacy/parsers/mod.rs | 6 +--
ws2p-v1-legacy/parsers/transactions.rs | 6 +--
ws2p/Cargo.toml | 2 +-
ws2p/generate_peer.rs | 2 +-
ws2p/lib.rs | 2 +-
65 files changed, 180 insertions(+), 180 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 04119058..495c0297 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -227,14 +227,30 @@ name = "dtoa"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "dubp-documents"
+version = "0.10.0-b1"
+dependencies = [
+ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dup-crypto 0.4.0-b1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest_derive 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "duniter-blockchain"
version = "0.1.0-a0.1"
dependencies = [
"dirs 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dubp-documents 0.10.0-b1",
"duniter-conf 0.1.0-a0.1",
"duniter-dal 0.1.0-a0.1",
- "duniter-documents 0.10.0-b1",
"duniter-message 0.1.0-a0.1",
"duniter-module 0.1.0-a0.1",
"duniter-network 0.1.0-a0.1",
@@ -256,7 +272,7 @@ name = "duniter-conf"
version = "0.1.0-a0.1"
dependencies = [
"dirs 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "duniter-documents 0.10.0-b1",
+ "dubp-documents 0.10.0-b1",
"duniter-module 0.1.0-a0.1",
"dup-crypto 0.4.0-b1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -291,7 +307,7 @@ dependencies = [
name = "duniter-dal"
version = "0.1.0-a0.1"
dependencies = [
- "duniter-documents 0.10.0-b1",
+ "dubp-documents 0.10.0-b1",
"duniter-module 0.1.0-a0.1",
"duniter-network 0.1.0-a0.1",
"dup-crypto 0.4.0-b1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -303,28 +319,12 @@ dependencies = [
"serde_json 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[package]]
-name = "duniter-documents"
-version = "0.10.0-b1"
-dependencies = [
- "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "dup-crypto 0.4.0-b1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest_derive 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "duniter-message"
version = "0.1.0-a0.1"
dependencies = [
+ "dubp-documents 0.10.0-b1",
"duniter-dal 0.1.0-a0.1",
- "duniter-documents 0.10.0-b1",
"duniter-module 0.1.0-a0.1",
"duniter-network 0.1.0-a0.1",
"dup-crypto 0.4.0-b1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -338,7 +338,7 @@ dependencies = [
name = "duniter-module"
version = "0.1.0-a0.1"
dependencies = [
- "duniter-documents 0.10.0-b1",
+ "dubp-documents 0.10.0-b1",
"dup-crypto 0.4.0-b1 (registry+https://github.com/rust-lang/crates.io-index)",
"durs-network-documents 0.1.0-a0.1",
"serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -351,7 +351,7 @@ dependencies = [
name = "duniter-network"
version = "0.1.0-a0.1"
dependencies = [
- "duniter-documents 0.10.0-b1",
+ "dubp-documents 0.10.0-b1",
"duniter-module 0.1.0-a0.1",
"dup-crypto 0.4.0-b1 (registry+https://github.com/rust-lang/crates.io-index)",
"durs-network-documents 0.1.0-a0.1",
@@ -364,9 +364,9 @@ dependencies = [
name = "duniter-tui"
version = "0.1.0-a0.1"
dependencies = [
+ "dubp-documents 0.10.0-b1",
"duniter-conf 0.1.0-a0.1",
"duniter-dal 0.1.0-a0.1",
- "duniter-documents 0.10.0-b1",
"duniter-message 0.1.0-a0.1",
"duniter-module 0.1.0-a0.1",
"duniter-network 0.1.0-a0.1",
@@ -424,7 +424,7 @@ version = "0.1.0-a0.1"
dependencies = [
"base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "duniter-documents 0.10.0-b1",
+ "dubp-documents 0.10.0-b1",
"dup-crypto 0.4.0-b1 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -451,8 +451,8 @@ name = "durs-ws2p"
version = "0.1.0-a0.1"
dependencies = [
"bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dubp-documents 0.10.0-b1",
"duniter-conf 0.1.0-a0.1",
- "duniter-documents 0.10.0-b1",
"duniter-message 0.1.0-a0.1",
"duniter-module 0.1.0-a0.1",
"duniter-network 0.1.0-a0.1",
@@ -471,7 +471,7 @@ version = "0.1.0-a0.1"
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)",
- "duniter-documents 0.10.0-b1",
+ "dubp-documents 0.10.0-b1",
"dup-crypto 0.4.0-b1 (registry+https://github.com/rust-lang/crates.io-index)",
"durs-network-documents 0.1.0-a0.1",
"log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -486,9 +486,9 @@ name = "durs-ws2p-v1-legacy"
version = "0.1.0-a0.1"
dependencies = [
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dubp-documents 0.10.0-b1",
"duniter-conf 0.1.0-a0.1",
"duniter-dal 0.1.0-a0.1",
- "duniter-documents 0.10.0-b1",
"duniter-message 0.1.0-a0.1",
"duniter-module 0.1.0-a0.1",
"duniter-network 0.1.0-a0.1",
diff --git a/blockchain/Cargo.toml b/blockchain/Cargo.toml
index 139b72eb..75ccbcce 100644
--- a/blockchain/Cargo.toml
+++ b/blockchain/Cargo.toml
@@ -13,7 +13,7 @@ dirs = "1.0.2"
duniter-conf = { path = "../conf" }
dup-crypto = "0.4.0-b1"
duniter-dal = { path = "../dal" }
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
durs-network-documents = { path = "../network-documents" }
duniter-message = { path = "../message" }
duniter-module = { path = "../module" }
diff --git a/blockchain/apply_valid_block.rs b/blockchain/apply_valid_block.rs
index 30c255c6..4e1154f5 100644
--- a/blockchain/apply_valid_block.rs
+++ b/blockchain/apply_valid_block.rs
@@ -13,14 +13,14 @@
// 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_documents::v10::transaction::{TxAmount, TxBase};
+use dubp_documents::v10::BlockDocument;
+use dubp_documents::BlockId;
+use dubp_documents::Document;
use duniter_dal::block::DALBlock;
use duniter_dal::sources::SourceAmount;
use duniter_dal::writers::requests::*;
use duniter_dal::{BinDB, ForkId};
-use duniter_documents::v10::transaction::{TxAmount, TxBase};
-use duniter_documents::v10::BlockDocument;
-use duniter_documents::BlockId;
-use duniter_documents::Document;
use dup_crypto::keys::*;
use durs_wot::data::{NewLinkResult, RemLinkResult};
use durs_wot::{NodeId, WebOfTrust};
diff --git a/blockchain/check_and_apply_block.rs b/blockchain/check_and_apply_block.rs
index 68481efc..4b38ca43 100644
--- a/blockchain/check_and_apply_block.rs
+++ b/blockchain/check_and_apply_block.rs
@@ -16,10 +16,10 @@
use std::collections::HashMap;
use apply_valid_block::*;
+use dubp_documents::Document;
+use dubp_documents::{BlockHash, BlockId, Blockstamp, PreviousBlockstamp};
use duniter_dal::block::DALBlock;
use duniter_dal::*;
-use duniter_documents::Document;
-use duniter_documents::{BlockHash, BlockId, Blockstamp, PreviousBlockstamp};
use duniter_network::NetworkBlock;
use dup_crypto::keys::*;
use *;
diff --git a/blockchain/dbex.rs b/blockchain/dbex.rs
index 368b8261..4e039bb1 100644
--- a/blockchain/dbex.rs
+++ b/blockchain/dbex.rs
@@ -13,8 +13,8 @@
// 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_documents::v10::transaction::*;
use duniter_dal::identity::DALIdentity;
-use duniter_documents::v10::transaction::*;
use duniter_module::DuniterConf;
use dup_crypto::keys::*;
use durs_wot::data::rusty::RustyWebOfTrust;
diff --git a/blockchain/lib.rs b/blockchain/lib.rs
index 67d300e8..b4e8a9bf 100644
--- a/blockchain/lib.rs
+++ b/blockchain/lib.rs
@@ -33,9 +33,9 @@
extern crate log;
extern crate dirs;
+extern crate dubp_documents;
extern crate duniter_conf;
extern crate duniter_dal;
-extern crate duniter_documents;
extern crate duniter_message;
extern crate duniter_module;
extern crate duniter_network;
@@ -62,6 +62,9 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH};
use apply_valid_block::*;
use check_and_apply_block::*;
pub use dbex::{DBExQuery, DBExTxQuery, DBExWotQuery};
+use dubp_documents::v10::{BlockDocument, V10Document};
+use dubp_documents::*;
+use dubp_documents::{DUBPDocument, Document};
use duniter_dal::block::DALBlock;
use duniter_dal::currency_params::CurrencyParameters;
use duniter_dal::dal_event::DALEvent;
@@ -69,9 +72,6 @@ use duniter_dal::dal_requests::{DALReqBlockchain, DALRequest, DALResBlockchain,
use duniter_dal::identity::DALIdentity;
use duniter_dal::writers::requests::BlocksDBsWriteQuery;
use duniter_dal::*;
-use duniter_documents::v10::{BlockDocument, V10Document};
-use duniter_documents::*;
-use duniter_documents::{DUBPDocument, Document};
use duniter_message::*;
use duniter_module::*;
use duniter_network::{
diff --git a/blockchain/revert_block.rs b/blockchain/revert_block.rs
index 1f40771a..64cfb889 100644
--- a/blockchain/revert_block.rs
+++ b/blockchain/revert_block.rs
@@ -13,14 +13,14 @@
// 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_documents::v10::block::TxDocOrTxHash;
+use dubp_documents::v10::transaction::{TxAmount, TxBase};
+use dubp_documents::Document;
use duniter_dal::block::DALBlock;
use duniter_dal::sources::SourceAmount;
use duniter_dal::writers::requests::*;
use duniter_dal::writers::transaction::DALTxV10;
use duniter_dal::{BinDB, ForkId, TxV10Datas};
-use duniter_documents::v10::block::TxDocOrTxHash;
-use duniter_documents::v10::transaction::{TxAmount, TxBase};
-use duniter_documents::Document;
use dup_crypto::keys::*;
use durs_wot::data::{NewLinkResult, RemLinkResult};
use durs_wot::{NodeId, WebOfTrust};
diff --git a/blockchain/sync.rs b/blockchain/sync.rs
index d6b21b61..e6c28868 100644
--- a/blockchain/sync.rs
+++ b/blockchain/sync.rs
@@ -20,10 +20,10 @@ extern crate threadpool;
use self::pbr::ProgressBar;
use self::threadpool::ThreadPool;
+use dubp_documents::{BlockHash, BlockId};
use duniter_dal::currency_params::CurrencyParameters;
use duniter_dal::writers::requests::*;
use duniter_dal::ForkId;
-use duniter_documents::{BlockHash, BlockId};
use duniter_network::NetworkBlock;
use dup_crypto::hashs::Hash;
use dup_crypto::keys::*;
diff --git a/blockchain/ts_parsers.rs b/blockchain/ts_parsers.rs
index b962ba11..4e1921c1 100644
--- a/blockchain/ts_parsers.rs
+++ b/blockchain/ts_parsers.rs
@@ -16,14 +16,14 @@
extern crate serde_json;
extern crate sqlite;
-use duniter_documents::v10::block::{BlockV10Parameters, TxDocOrTxHash};
-use duniter_documents::v10::identity::*;
-use duniter_documents::v10::membership::*;
-use duniter_documents::v10::transaction::*;
-use duniter_documents::v10::*;
-use duniter_documents::CurrencyName;
-use duniter_documents::DocumentBuilder;
-use duniter_documents::{BlockHash, BlockId, Blockstamp};
+use dubp_documents::v10::block::{BlockV10Parameters, TxDocOrTxHash};
+use dubp_documents::v10::identity::*;
+use dubp_documents::v10::membership::*;
+use dubp_documents::v10::transaction::*;
+use dubp_documents::v10::*;
+use dubp_documents::CurrencyName;
+use dubp_documents::DocumentBuilder;
+use dubp_documents::{BlockHash, BlockId, Blockstamp};
use duniter_network::{NetworkBlock, NetworkBlockV10};
use dup_crypto::hashs::Hash;
use dup_crypto::keys::*;
diff --git a/conf/Cargo.toml b/conf/Cargo.toml
index ce152b57..2b43ab0c 100644
--- a/conf/Cargo.toml
+++ b/conf/Cargo.toml
@@ -15,7 +15,7 @@ serde_derive = "1.0.*"
serde_json = "1.0.*"
dirs = "1.0.2"
dup-crypto = "0.4.0-b1"
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
duniter-module = { path = "../module" }
[features]
diff --git a/conf/lib.rs b/conf/lib.rs
index 3dc3970f..657e69e6 100644
--- a/conf/lib.rs
+++ b/conf/lib.rs
@@ -35,12 +35,12 @@ extern crate serde_derive;
extern crate serde_json;
extern crate dirs;
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate duniter_module;
extern crate dup_crypto;
extern crate rand;
extern crate serde;
-use duniter_documents::CurrencyName;
+use dubp_documents::CurrencyName;
use duniter_module::{DuniterConf, ModuleName, RequiredKeys, RequiredKeysContent};
use dup_crypto::keys::*;
use rand::Rng;
diff --git a/dal/Cargo.toml b/dal/Cargo.toml
index b2b3831a..96d91bd7 100644
--- a/dal/Cargo.toml
+++ b/dal/Cargo.toml
@@ -10,7 +10,7 @@ path = "lib.rs"
[dependencies]
dup-crypto = "0.4.0-b1"
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
duniter-module = { path = "../module" }
duniter-network = { path = "../network" }
durs-wot = { path = "../wot" }
diff --git a/dal/block.rs b/dal/block.rs
index d56c1d5b..e13237fe 100644
--- a/dal/block.rs
+++ b/dal/block.rs
@@ -14,9 +14,9 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
use super::constants::MAX_FORKS;
-use duniter_documents::v10::BlockDocument;
-use duniter_documents::Document;
-use duniter_documents::{BlockHash, BlockId, Blockstamp, PreviousBlockstamp};
+use dubp_documents::v10::BlockDocument;
+use dubp_documents::Document;
+use dubp_documents::{BlockHash, BlockId, Blockstamp, PreviousBlockstamp};
use dup_crypto::keys::*;
use durs_wot::NodeId;
use std::collections::HashMap;
diff --git a/dal/certs.rs b/dal/certs.rs
index 532ceeae..a28e5455 100644
--- a/dal/certs.rs
+++ b/dal/certs.rs
@@ -13,10 +13,10 @@
// 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/>.
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate durs_wot;
-use duniter_documents::BlockId;
+use dubp_documents::BlockId;
use durs_wot::NodeId;
use std::collections::HashMap;
use {BinDB, CertsExpirV10Datas, DALError};
diff --git a/dal/currency_params.rs b/dal/currency_params.rs
index 5b902385..c88d4a45 100644
--- a/dal/currency_params.rs
+++ b/dal/currency_params.rs
@@ -14,8 +14,8 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
use constants::*;
-use duniter_documents::v10::block::BlockV10Parameters;
-use duniter_documents::CurrencyName;
+use dubp_documents::v10::block::BlockV10Parameters;
+use dubp_documents::CurrencyName;
use *;
#[derive(Debug, Copy, Clone)]
diff --git a/dal/dal_event.rs b/dal/dal_event.rs
index 19f2659f..398f6193 100644
--- a/dal/dal_event.rs
+++ b/dal/dal_event.rs
@@ -13,8 +13,8 @@
// 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 duniter_documents::v10::block::BlockDocument;
-use duniter_documents::*;
+use dubp_documents::v10::block::BlockDocument;
+use dubp_documents::*;
#[derive(Debug, Clone)]
/// Event to be transmitted to the other modules
diff --git a/dal/dal_requests.rs b/dal/dal_requests.rs
index ae3fc49b..dc5cfa3d 100644
--- a/dal/dal_requests.rs
+++ b/dal/dal_requests.rs
@@ -17,12 +17,12 @@ extern crate duniter_module;
extern crate serde;
use self::duniter_module::ModuleReqId;
-use duniter_documents::v10::block::BlockDocument;
-use duniter_documents::v10::certification::CertificationDocument;
-use duniter_documents::v10::identity::IdentityDocument;
-use duniter_documents::v10::membership::MembershipDocument;
-use duniter_documents::v10::revocation::RevocationDocument;
-use duniter_documents::Blockstamp;
+use dubp_documents::v10::block::BlockDocument;
+use dubp_documents::v10::certification::CertificationDocument;
+use dubp_documents::v10::identity::IdentityDocument;
+use dubp_documents::v10::membership::MembershipDocument;
+use dubp_documents::v10::revocation::RevocationDocument;
+use dubp_documents::Blockstamp;
use dup_crypto::hashs::Hash;
use dup_crypto::keys::*;
use std::collections::HashMap;
diff --git a/dal/identity.rs b/dal/identity.rs
index 07134c9a..be1d79e2 100644
--- a/dal/identity.rs
+++ b/dal/identity.rs
@@ -14,8 +14,8 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
use currency_params::CurrencyParameters;
-use duniter_documents::v10::identity::IdentityDocument;
-use duniter_documents::{BlockId, Blockstamp};
+use dubp_documents::v10::identity::IdentityDocument;
+use dubp_documents::{BlockId, Blockstamp};
use dup_crypto::keys::*;
use durs_wot::NodeId;
use std::collections::HashMap;
diff --git a/dal/lib.rs b/dal/lib.rs
index d959250e..653b97fa 100644
--- a/dal/lib.rs
+++ b/dal/lib.rs
@@ -36,7 +36,7 @@ extern crate serde_json;
#[macro_use]
extern crate serde_derive;
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate dup_crypto;
extern crate durs_wot;
extern crate rustbreak;
@@ -78,10 +78,10 @@ pub mod tools;
/// Contains all write databases functions
pub mod writers;
-use duniter_documents::v10::block::BlockV10Parameters;
-use duniter_documents::v10::transaction::*;
-use duniter_documents::CurrencyName;
-use duniter_documents::{BlockHash, BlockId, Blockstamp, PreviousBlockstamp};
+use dubp_documents::v10::block::BlockV10Parameters;
+use dubp_documents::v10::transaction::*;
+use dubp_documents::CurrencyName;
+use dubp_documents::{BlockHash, BlockId, Blockstamp, PreviousBlockstamp};
use dup_crypto::hashs::Hash;
use dup_crypto::keys::*;
use durs_wot::{NodeId, WebOfTrust};
diff --git a/dal/parsers/certifications.rs b/dal/parsers/certifications.rs
index 97c5e18b..868c8286 100644
--- a/dal/parsers/certifications.rs
+++ b/dal/parsers/certifications.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 duniter_documents::v10::certification::{CertificationDocument, CompactCertificationDocument};
-use duniter_documents::v10::TextDocumentFormat;
-use duniter_documents::BlockId;
+use dubp_documents::v10::certification::{CertificationDocument, CompactCertificationDocument};
+use dubp_documents::v10::TextDocumentFormat;
+use dubp_documents::BlockId;
use dup_crypto::keys::*;
use serde_json;
diff --git a/dal/parsers/revoked.rs b/dal/parsers/revoked.rs
index 46d2801e..c47b486a 100644
--- a/dal/parsers/revoked.rs
+++ b/dal/parsers/revoked.rs
@@ -13,8 +13,8 @@
// 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 duniter_documents::v10::revocation::{CompactRevocationDocument, RevocationDocument};
-use duniter_documents::v10::TextDocumentFormat;
+use dubp_documents::v10::revocation::{CompactRevocationDocument, RevocationDocument};
+use dubp_documents::v10::TextDocumentFormat;
use dup_crypto::keys::*;
use serde_json;
diff --git a/dal/sources.rs b/dal/sources.rs
index aab5056f..3e5b1268 100644
--- a/dal/sources.rs
+++ b/dal/sources.rs
@@ -13,11 +13,11 @@
// 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/>.
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate dup_crypto;
-use duniter_documents::v10::transaction::*;
-use duniter_documents::BlockId;
+use dubp_documents::v10::transaction::*;
+use dubp_documents::BlockId;
use dup_crypto::hashs::Hash;
use dup_crypto::keys::PubKey;
use std::cmp::Ordering;
diff --git a/dal/writers/block.rs b/dal/writers/block.rs
index a716aa44..46a6bb11 100644
--- a/dal/writers/block.rs
+++ b/dal/writers/block.rs
@@ -14,8 +14,8 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
use block::DALBlock;
-use duniter_documents::Document;
-use duniter_documents::{BlockHash, BlockId, PreviousBlockstamp};
+use dubp_documents::Document;
+use dubp_documents::{BlockHash, BlockId, PreviousBlockstamp};
use std::collections::HashMap;
use ForkId;
use {BinDB, DALError, ForksBlocksV10Datas, ForksV10Datas, LocalBlockchainV10Datas};
diff --git a/dal/writers/certification.rs b/dal/writers/certification.rs
index 327db05e..c8be5195 100644
--- a/dal/writers/certification.rs
+++ b/dal/writers/certification.rs
@@ -14,8 +14,8 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
use currency_params::CurrencyParameters;
-use duniter_documents::v10::certification::CompactCertificationDocument;
-use duniter_documents::BlockId;
+use dubp_documents::v10::certification::CompactCertificationDocument;
+use dubp_documents::BlockId;
use dup_crypto::keys::*;
use durs_wot::NodeId;
use {BinDB, CertsExpirV10Datas, DALError, IdentitiesV10Datas};
diff --git a/dal/writers/dividend.rs b/dal/writers/dividend.rs
index f2828d8d..9256ae65 100644
--- a/dal/writers/dividend.rs
+++ b/dal/writers/dividend.rs
@@ -13,8 +13,8 @@
// 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 duniter_documents::v10::transaction::*;
-use duniter_documents::BlockId;
+use dubp_documents::v10::transaction::*;
+use dubp_documents::BlockId;
use dup_crypto::keys::PubKey;
use sources::SourceAmount;
use std::collections::{HashMap, HashSet};
diff --git a/dal/writers/identity.rs b/dal/writers/identity.rs
index ebd29fa0..3a965464 100644
--- a/dal/writers/identity.rs
+++ b/dal/writers/identity.rs
@@ -14,9 +14,9 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
use currency_params::CurrencyParameters;
-use duniter_documents::v10::identity::IdentityDocument;
-use duniter_documents::Document;
-use duniter_documents::{BlockId, Blockstamp};
+use dubp_documents::v10::identity::IdentityDocument;
+use dubp_documents::Document;
+use dubp_documents::{BlockId, Blockstamp};
use dup_crypto::keys::PubKey;
use durs_wot::NodeId;
use identity::{DALIdentity, DALIdentityState};
diff --git a/dal/writers/requests.rs b/dal/writers/requests.rs
index fe5f84da..73ecb83e 100644
--- a/dal/writers/requests.rs
+++ b/dal/writers/requests.rs
@@ -15,9 +15,9 @@
use block::DALBlock;
use currency_params::CurrencyParameters;
-use duniter_documents::v10::certification::CompactCertificationDocument;
-use duniter_documents::v10::identity::IdentityDocument;
-use duniter_documents::Blockstamp;
+use dubp_documents::v10::certification::CompactCertificationDocument;
+use dubp_documents::v10::identity::IdentityDocument;
+use dubp_documents::Blockstamp;
use dup_crypto::keys::PubKey;
use durs_wot::NodeId;
use identity::DALIdentity;
diff --git a/dal/writers/transaction.rs b/dal/writers/transaction.rs
index a7c23d1f..f7b8c5c7 100644
--- a/dal/writers/transaction.rs
+++ b/dal/writers/transaction.rs
@@ -13,7 +13,7 @@
// 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 duniter_documents::v10::transaction::*;
+use dubp_documents::v10::transaction::*;
use sources::{SourceAmount, SourceIndexV10, UTXOIndexV10, UTXOV10};
use *;
@@ -414,7 +414,7 @@ pub fn apply_and_write_tx(
#[cfg(test)]
mod tests {
use super::*;
- use duniter_documents::{Document, DocumentBuilder, VerificationResult};
+ use dubp_documents::{Document, DocumentBuilder, VerificationResult};
use std::str::FromStr;
fn build_first_tx_of_g1() -> TransactionDocument {
diff --git a/documents/Cargo.toml b/documents/Cargo.toml
index 49d4c53c..df47a180 100644
--- a/documents/Cargo.toml
+++ b/documents/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "duniter-documents"
+name = "dubp-documents"
version = "0.10.0-b1"
authors = ["nanocryk <nanocryk@duniter.org>", "elois <elois@ifee.fr>"]
description = "Handles DUBP documents (DUBP: DUniter Blockhain Protocol)"
diff --git a/documents/README.md b/documents/README.md
index 6191c3d0..b90670dd 100644
--- a/documents/README.md
+++ b/documents/README.md
@@ -7,4 +7,4 @@
## How to use it
-You can add `duniter-documents` as a `cargo` dependency in your Rust project.
+You can add `dubp-documents` as a `cargo` dependency in your Rust project.
diff --git a/message/Cargo.toml b/message/Cargo.toml
index bb4e0a22..3f287244 100644
--- a/message/Cargo.toml
+++ b/message/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
[dependencies]
dup-crypto = "0.4.0-b1"
duniter-dal = { path = "../dal" }
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
duniter-module = { path = "../module" }
duniter-network = { path = "../network" }
durs-network-documents = { path = "../network-documents" }
diff --git a/message/lib.rs b/message/lib.rs
index d2d1e2e5..6b1b93a7 100644
--- a/message/lib.rs
+++ b/message/lib.rs
@@ -29,8 +29,8 @@
unused_qualifications
)]
+extern crate dubp_documents;
extern crate duniter_dal;
-extern crate duniter_documents;
extern crate duniter_module;
extern crate duniter_network;
extern crate dup_crypto;
@@ -38,10 +38,10 @@ extern crate durs_network_documents;
extern crate serde;
extern crate serde_json;
+use dubp_documents::BlockId;
+use dubp_documents::DUBPDocument;
use duniter_dal::dal_event::DALEvent;
use duniter_dal::dal_requests::{DALRequest, DALResponse};
-use duniter_documents::BlockId;
-use duniter_documents::DUBPDocument;
use duniter_module::*;
use duniter_network::{NetworkEvent, NetworkResponse, OldNetworkRequest};
use dup_crypto::hashs::Hash;
diff --git a/module/Cargo.toml b/module/Cargo.toml
index a78bd241..c24a8c94 100644
--- a/module/Cargo.toml
+++ b/module/Cargo.toml
@@ -10,7 +10,7 @@ path = "lib.rs"
[dependencies]
dup-crypto = "0.4.0-b1"
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
durs-network-documents = { path = "../network-documents" }
serde = "1.0.*"
serde_derive = "1.0.*"
diff --git a/module/lib.rs b/module/lib.rs
index a2834f43..55625dd3 100644
--- a/module/lib.rs
+++ b/module/lib.rs
@@ -32,14 +32,14 @@
#[macro_use]
extern crate serde_derive;
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate dup_crypto;
extern crate durs_network_documents;
extern crate serde;
extern crate serde_json;
extern crate structopt;
-use duniter_documents::CurrencyName;
+use dubp_documents::CurrencyName;
use dup_crypto::keys::{KeyPair, KeyPairEnum};
use durs_network_documents::network_endpoint::EndpointEnum;
use serde::de::DeserializeOwned;
diff --git a/network-documents/Cargo.toml b/network-documents/Cargo.toml
index 65a6aa4f..33258e91 100644
--- a/network-documents/Cargo.toml
+++ b/network-documents/Cargo.toml
@@ -11,7 +11,7 @@ path = "src/lib.rs"
[dependencies]
base58 = "0.1.*"
dup-crypto = "0.4.0-b1"
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
hex = "0.3.*"
pest = "2.0"
pest_derive = "2.0"
diff --git a/network-documents/src/lib.rs b/network-documents/src/lib.rs
index e2fc967a..ab80b8b3 100644
--- a/network-documents/src/lib.rs
+++ b/network-documents/src/lib.rs
@@ -27,7 +27,7 @@
)]
extern crate base58;
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate dup_crypto;
extern crate hex;
extern crate pest;
diff --git a/network-documents/src/network_endpoint.rs b/network-documents/src/network_endpoint.rs
index 479c8c3e..cbf80fb5 100644
--- a/network-documents/src/network_endpoint.rs
+++ b/network-documents/src/network_endpoint.rs
@@ -15,7 +15,7 @@
//! Module defining the format of network endpoints and how to handle them.
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate dup_crypto;
extern crate serde;
diff --git a/network-documents/src/network_head.rs b/network-documents/src/network_head.rs
index 396e977c..78efe08c 100644
--- a/network-documents/src/network_head.rs
+++ b/network-documents/src/network_head.rs
@@ -15,7 +15,7 @@
//! Module defining the format of network heads and how to handle them.
-use duniter_documents::blockstamp::*;
+use dubp_documents::blockstamp::*;
use dup_crypto::keys::*;
use network_head_v2::*;
use network_head_v3::*;
diff --git a/network-documents/src/network_head_v2.rs b/network-documents/src/network_head_v2.rs
index c7f2e524..5b9c72c8 100644
--- a/network-documents/src/network_head_v2.rs
+++ b/network-documents/src/network_head_v2.rs
@@ -15,7 +15,7 @@
//! Module defining the format of network heads v2 and how to handle them.
-use duniter_documents::blockstamp::*;
+use dubp_documents::blockstamp::*;
use dup_crypto::keys::*;
use std::cmp::Ordering;
use std::num::ParseIntError;
diff --git a/network-documents/src/network_head_v3.rs b/network-documents/src/network_head_v3.rs
index e9998fe2..04be5213 100644
--- a/network-documents/src/network_head_v3.rs
+++ b/network-documents/src/network_head_v3.rs
@@ -16,8 +16,8 @@
//! Module defining the format of network heads v3 and how to handle them.
use base58::ToBase58;
-use duniter_documents::blockstamp::Blockstamp;
-use duniter_documents::{BlockHash, BlockId, CurrencyName, ToJsonObject};
+use dubp_documents::blockstamp::Blockstamp;
+use dubp_documents::{BlockHash, BlockId, CurrencyName, ToJsonObject};
use dup_crypto::keys::text_signable::TextSignable;
use dup_crypto::keys::*;
use pest::iterators::Pair;
diff --git a/network-documents/src/network_peer.rs b/network-documents/src/network_peer.rs
index c80a23e4..134ef7e7 100644
--- a/network-documents/src/network_peer.rs
+++ b/network-documents/src/network_peer.rs
@@ -15,13 +15,13 @@
//! Module defining the format of network peer cards and how to handle them.
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate dup_crypto;
extern crate serde;
use base58::ToBase58;
-use duniter_documents::{blockstamp::Blockstamp, CurrencyName};
-use duniter_documents::{BlockHash, BlockId};
+use dubp_documents::{blockstamp::Blockstamp, CurrencyName};
+use dubp_documents::{BlockHash, BlockId};
use dup_crypto::keys::text_signable::TextSignable;
use dup_crypto::keys::*;
use network_endpoint::*;
diff --git a/network/Cargo.toml b/network/Cargo.toml
index 782ca8cc..6987882f 100644
--- a/network/Cargo.toml
+++ b/network/Cargo.toml
@@ -10,7 +10,7 @@ path = "lib.rs"
[dependencies]
dup-crypto = "0.4.0-b1"
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
duniter-module = { path = "../module" }
durs-network-documents = { path = "../network-documents" }
serde = "1.0.*"
diff --git a/network/lib.rs b/network/lib.rs
index 36aa7ca1..16d3bc43 100644
--- a/network/lib.rs
+++ b/network/lib.rs
@@ -28,21 +28,21 @@
unused_qualifications
)]
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate duniter_module;
extern crate dup_crypto;
extern crate durs_network_documents;
extern crate serde;
extern crate serde_json;
-use duniter_documents::v10::block::BlockDocument;
-use duniter_documents::v10::certification::CertificationDocument;
-use duniter_documents::v10::identity::IdentityDocument;
-use duniter_documents::v10::membership::MembershipDocument;
-use duniter_documents::v10::revocation::RevocationDocument;
-use duniter_documents::v10::transaction::TransactionDocument;
-use duniter_documents::Document;
-use duniter_documents::{blockstamp::Blockstamp, BlockHash, BlockId};
+use dubp_documents::v10::block::BlockDocument;
+use dubp_documents::v10::certification::CertificationDocument;
+use dubp_documents::v10::identity::IdentityDocument;
+use dubp_documents::v10::membership::MembershipDocument;
+use dubp_documents::v10::revocation::RevocationDocument;
+use dubp_documents::v10::transaction::TransactionDocument;
+use dubp_documents::Document;
+use dubp_documents::{blockstamp::Blockstamp, BlockHash, BlockId};
use duniter_module::*;
use durs_network_documents::network_endpoint::ApiFeatures;
use durs_network_documents::network_head::NetworkHead;
diff --git a/tui/Cargo.toml b/tui/Cargo.toml
index eae65ff3..38ddc890 100644
--- a/tui/Cargo.toml
+++ b/tui/Cargo.toml
@@ -12,7 +12,7 @@ path = "lib.rs"
duniter-conf = { path = "../conf" }
dup-crypto = "0.4.0-b1"
duniter-dal = { path = "../dal" }
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
duniter-message = { path = "../message" }
duniter-module = { path = "../module" }
duniter-network = { path = "../network" }
diff --git a/tui/lib.rs b/tui/lib.rs
index eda01690..21beb0fe 100644
--- a/tui/lib.rs
+++ b/tui/lib.rs
@@ -36,9 +36,9 @@ extern crate serde_derive;
#[macro_use]
extern crate structopt;
+extern crate dubp_documents;
extern crate duniter_conf;
extern crate duniter_dal;
-extern crate duniter_documents;
extern crate duniter_message;
extern crate duniter_module;
extern crate duniter_network;
diff --git a/ws2p-messages/Cargo.toml b/ws2p-messages/Cargo.toml
index c14e690f..fe30cd96 100644
--- a/ws2p-messages/Cargo.toml
+++ b/ws2p-messages/Cargo.toml
@@ -12,7 +12,7 @@ path = "lib.rs"
bincode = "1.0.*"
byteorder = "1.2.3"
dup-crypto = "0.4.0-b1"
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
durs-network-documents = { path = "../network-documents" }
log = "0.4.*"
serde = "1.0.*"
diff --git a/ws2p-messages/lib.rs b/ws2p-messages/lib.rs
index 63e50c1c..b1e17ec7 100644
--- a/ws2p-messages/lib.rs
+++ b/ws2p-messages/lib.rs
@@ -36,7 +36,7 @@ extern crate serde_derive;
extern crate bincode;
extern crate byteorder;
-extern crate duniter_documents;
+extern crate dubp_documents;
extern crate dup_crypto;
extern crate durs_network_documents;
@@ -56,8 +56,8 @@ pub enum WS2PMessage {
mod tests {
use bincode;
use bincode::{deserialize, serialize};
- use duniter_documents::v10::certification::*;
- use duniter_documents::{Blockstamp, CurrencyName};
+ use dubp_documents::v10::certification::*;
+ use dubp_documents::{Blockstamp, CurrencyName};
use dup_crypto::keys::bin_signable::BinSignable;
use dup_crypto::keys::*;
use durs_network_documents::network_endpoint::*;
diff --git a/ws2p-messages/v2/connect.rs b/ws2p-messages/v2/connect.rs
index 37d70705..42c5144a 100644
--- a/ws2p-messages/v2/connect.rs
+++ b/ws2p-messages/v2/connect.rs
@@ -15,7 +15,7 @@
//use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
use super::api_features::WS2PFeatures;
-use duniter_documents::Blockstamp;
+use dubp_documents::Blockstamp;
use dup_crypto::hashs::Hash;
use durs_network_documents::network_peer::PeerCardV11;
@@ -86,7 +86,7 @@ impl Default for WS2Pv2ConnectMsg {
mod tests {
use super::super::*;
use super::*;
- use duniter_documents::Blockstamp;
+ use dubp_documents::Blockstamp;
use dup_crypto::keys::text_signable::TextSignable;
use tests::*;
diff --git a/ws2p-messages/v2/mod.rs b/ws2p-messages/v2/mod.rs
index af7d32e9..3b0bce74 100644
--- a/ws2p-messages/v2/mod.rs
+++ b/ws2p-messages/v2/mod.rs
@@ -28,7 +28,7 @@ pub mod requests;
/// WS2P v2 SECRET_FLAGS Message
pub mod secret_flags;
-use duniter_documents::CurrencyName;
+use dubp_documents::CurrencyName;
use dup_crypto::hashs::Hash;
use dup_crypto::keys::bin_signable::BinSignable;
use dup_crypto::keys::*;
diff --git a/ws2p-messages/v2/ok.rs b/ws2p-messages/v2/ok.rs
index 8a83a405..ea8116e3 100644
--- a/ws2p-messages/v2/ok.rs
+++ b/ws2p-messages/v2/ok.rs
@@ -13,7 +13,7 @@
// 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 duniter_documents::Blockstamp;
+use dubp_documents::Blockstamp;
use dup_crypto::hashs::Hash;
use std::num::NonZeroU16;
@@ -48,7 +48,7 @@ pub struct WS2Pv2SyncTarget {
mod tests {
use super::super::*;
use super::*;
- use duniter_documents::Blockstamp;
+ use dubp_documents::Blockstamp;
use std::num::NonZeroU16;
use tests::*;
diff --git a/ws2p-messages/v2/payload_container.rs b/ws2p-messages/v2/payload_container.rs
index 8bf5cfd8..25b39533 100644
--- a/ws2p-messages/v2/payload_container.rs
+++ b/ws2p-messages/v2/payload_container.rs
@@ -18,12 +18,12 @@ use super::ok::WS2Pv2OkMsg;
use super::req_responses::WS2Pv2ReqRes;
use super::requests::WS2Pv2Request;
use super::secret_flags::WS2Pv2SecretFlagsMsg;
-use duniter_documents::v10::block::BlockDocument;
-use duniter_documents::v10::certification::CertificationDocument;
-use duniter_documents::v10::identity::IdentityDocument;
-use duniter_documents::v10::membership::MembershipDocument;
-use duniter_documents::v10::revocation::RevocationDocument;
-use duniter_documents::v10::transaction::TransactionDocument;
+use dubp_documents::v10::block::BlockDocument;
+use dubp_documents::v10::certification::CertificationDocument;
+use dubp_documents::v10::identity::IdentityDocument;
+use dubp_documents::v10::membership::MembershipDocument;
+use dubp_documents::v10::revocation::RevocationDocument;
+use dubp_documents::v10::transaction::TransactionDocument;
use dup_crypto::hashs::Hash;
use durs_network_documents::network_head_v2::NetworkHeadV2;
use durs_network_documents::network_head_v3::NetworkHeadV3;
diff --git a/ws2p-messages/v2/req_responses.rs b/ws2p-messages/v2/req_responses.rs
index 618234a1..8d0a80b8 100644
--- a/ws2p-messages/v2/req_responses.rs
+++ b/ws2p-messages/v2/req_responses.rs
@@ -13,11 +13,11 @@
// 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 duniter_documents::v10::block::BlockDocument;
-use duniter_documents::v10::certification::CompactCertificationDocument;
-use duniter_documents::v10::identity::CompactIdentityDocument;
-use duniter_documents::v10::membership::CompactPoolMembershipDoc;
-use duniter_documents::Blockstamp;
+use dubp_documents::v10::block::BlockDocument;
+use dubp_documents::v10::certification::CompactCertificationDocument;
+use dubp_documents::v10::identity::CompactIdentityDocument;
+use dubp_documents::v10::membership::CompactPoolMembershipDoc;
+use dubp_documents::Blockstamp;
use dup_crypto::hashs::Hash;
use std::str;
@@ -62,7 +62,7 @@ pub struct WotPoolFolder {
mod tests {
use super::super::*;
use super::*;
- use duniter_documents::Blockstamp;
+ use dubp_documents::Blockstamp;
use tests::*;
#[test]
diff --git a/ws2p-messages/v2/requests.rs b/ws2p-messages/v2/requests.rs
index e160f7e1..1d15c7ea 100644
--- a/ws2p-messages/v2/requests.rs
+++ b/ws2p-messages/v2/requests.rs
@@ -13,7 +13,7 @@
// 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 duniter_documents::{BlockId, Blockstamp};
+use dubp_documents::{BlockId, Blockstamp};
/// WS2Pv2Request
#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
@@ -74,7 +74,7 @@ impl WS2Pv2RequestBody {
mod tests {
use super::super::*;
use super::*;
- use duniter_documents::Blockstamp;
+ use dubp_documents::Blockstamp;
use tests::*;
#[test]
diff --git a/ws2p-v1-legacy/Cargo.toml b/ws2p-v1-legacy/Cargo.toml
index 0c56b714..65e2f84e 100644
--- a/ws2p-v1-legacy/Cargo.toml
+++ b/ws2p-v1-legacy/Cargo.toml
@@ -13,7 +13,7 @@ byteorder = "1.2.3"
duniter-conf = { path = "../conf" }
dup-crypto = "0.4.0-b1"
duniter-dal = { path = "../dal" }
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
durs-network-documents = { path = "../network-documents" }
duniter-message = { path = "../message" }
duniter-module = { path = "../module" }
diff --git a/ws2p-v1-legacy/datas.rs b/ws2p-v1-legacy/datas.rs
index a73937d4..8eda2642 100644
--- a/ws2p-v1-legacy/datas.rs
+++ b/ws2p-v1-legacy/datas.rs
@@ -14,8 +14,8 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
use constants::*;
+use dubp_documents::Blockstamp;
use duniter_dal::dal_requests::DALRequest;
-use duniter_documents::Blockstamp;
use duniter_message::*;
use duniter_network::*;
use dup_crypto::keys::*;
diff --git a/ws2p-v1-legacy/heads.rs b/ws2p-v1-legacy/heads.rs
index bdcb8f64..33349c89 100644
--- a/ws2p-v1-legacy/heads.rs
+++ b/ws2p-v1-legacy/heads.rs
@@ -13,7 +13,7 @@
// 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 duniter_documents::Blockstamp;
+use dubp_documents::Blockstamp;
use durs_network_documents::network_head_v2::*;
use *;
diff --git a/ws2p-v1-legacy/lib.rs b/ws2p-v1-legacy/lib.rs
index 520ef355..a8e71cae 100644
--- a/ws2p-v1-legacy/lib.rs
+++ b/ws2p-v1-legacy/lib.rs
@@ -37,9 +37,9 @@ extern crate serde_json;
extern crate structopt;
extern crate byteorder;
+extern crate dubp_documents;
extern crate duniter_conf;
extern crate duniter_dal;
-extern crate duniter_documents;
extern crate duniter_message;
extern crate duniter_module;
extern crate duniter_network;
@@ -65,10 +65,10 @@ use ack_message::WS2PAckMessageV1;
use connect_message::WS2PConnectMessageV1;
use constants::*;
use datas::*;
+use dubp_documents::Blockstamp;
use duniter_conf::DuRsConf;
use duniter_dal::dal_event::DALEvent;
use duniter_dal::dal_requests::{DALReqBlockchain, DALRequest, DALResBlockchain, DALResponse};
-use duniter_documents::Blockstamp;
use duniter_message::*;
use duniter_module::*;
use duniter_network::*;
@@ -918,9 +918,9 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
#[cfg(test)]
mod tests {
+ extern crate dubp_documents;
extern crate duniter_conf;
extern crate duniter_dal;
- extern crate duniter_documents;
extern crate duniter_message;
extern crate duniter_module;
extern crate duniter_network;
@@ -928,7 +928,7 @@ mod tests {
use super::parsers::blocks::parse_json_block;
use super::*;
- use duniter_documents::v10::BlockDocument;
+ use dubp_documents::v10::BlockDocument;
use duniter_module::DuniterModule;
use duniter_network::NetworkBlock;
use dup_crypto::keys::PublicKey;
diff --git a/ws2p-v1-legacy/parsers/blocks.rs b/ws2p-v1-legacy/parsers/blocks.rs
index 099fcb0e..633fe353 100644
--- a/ws2p-v1-legacy/parsers/blocks.rs
+++ b/ws2p-v1-legacy/parsers/blocks.rs
@@ -3,11 +3,11 @@ extern crate serde_json;
use super::excluded::parse_exclusions_from_json_value;
use super::identities::parse_compact_identity;
use super::transactions::parse_transaction;
-use duniter_documents::v10::block::{BlockV10Parameters, TxDocOrTxHash};
-use duniter_documents::v10::membership::*;
-use duniter_documents::v10::BlockDocument;
-use duniter_documents::CurrencyName;
-use duniter_documents::{BlockHash, BlockId};
+use dubp_documents::v10::block::{BlockV10Parameters, TxDocOrTxHash};
+use dubp_documents::v10::membership::*;
+use dubp_documents::v10::BlockDocument;
+use dubp_documents::CurrencyName;
+use dubp_documents::{BlockHash, BlockId};
use duniter_network::{NetworkBlock, NetworkBlockV10};
use dup_crypto::hashs::Hash;
use dup_crypto::keys::*;
diff --git a/ws2p-v1-legacy/parsers/identities.rs b/ws2p-v1-legacy/parsers/identities.rs
index 1955b1cf..898a949b 100644
--- a/ws2p-v1-legacy/parsers/identities.rs
+++ b/ws2p-v1-legacy/parsers/identities.rs
@@ -1,8 +1,8 @@
extern crate serde_json;
-use duniter_documents::v10::identity::*;
-use duniter_documents::Blockstamp;
-use duniter_documents::DocumentBuilder;
+use dubp_documents::v10::identity::*;
+use dubp_documents::Blockstamp;
+use dubp_documents::DocumentBuilder;
use dup_crypto::keys::*;
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
diff --git a/ws2p-v1-legacy/parsers/memberships.rs b/ws2p-v1-legacy/parsers/memberships.rs
index 56740278..936d84fa 100644
--- a/ws2p-v1-legacy/parsers/memberships.rs
+++ b/ws2p-v1-legacy/parsers/memberships.rs
@@ -1,8 +1,8 @@
extern crate serde_json;
-use duniter_documents::v10::membership::*;
-use duniter_documents::Blockstamp;
-use duniter_documents::DocumentBuilder;
+use dubp_documents::v10::membership::*;
+use dubp_documents::Blockstamp;
+use dubp_documents::DocumentBuilder;
use dup_crypto::keys::*;
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
diff --git a/ws2p-v1-legacy/parsers/mod.rs b/ws2p-v1-legacy/parsers/mod.rs
index 19254240..5392408a 100644
--- a/ws2p-v1-legacy/parsers/mod.rs
+++ b/ws2p-v1-legacy/parsers/mod.rs
@@ -22,9 +22,9 @@ pub mod transactions;
#[cfg(test)]
mod tests {
use super::transactions::*;
- use duniter_documents::v10::transaction::*;
- use duniter_documents::Blockstamp;
- use duniter_documents::DocumentBuilder;
+ use dubp_documents::v10::transaction::*;
+ use dubp_documents::Blockstamp;
+ use dubp_documents::DocumentBuilder;
use dup_crypto::keys::*;
use std::str::FromStr;
diff --git a/ws2p-v1-legacy/parsers/transactions.rs b/ws2p-v1-legacy/parsers/transactions.rs
index fe1307f5..46f2d76f 100644
--- a/ws2p-v1-legacy/parsers/transactions.rs
+++ b/ws2p-v1-legacy/parsers/transactions.rs
@@ -1,12 +1,12 @@
extern crate serde;
extern crate serde_json;
-use duniter_documents::v10::transaction::{
+use dubp_documents::v10::transaction::{
TransactionDocument, TransactionDocumentBuilder, TransactionInput, TransactionInputUnlocks,
TransactionOutput,
};
-use duniter_documents::Blockstamp;
-use duniter_documents::DocumentBuilder;
+use dubp_documents::Blockstamp;
+use dubp_documents::DocumentBuilder;
use dup_crypto::hashs::Hash;
use dup_crypto::keys::*;
use std::str::FromStr;
diff --git a/ws2p/Cargo.toml b/ws2p/Cargo.toml
index 1161c012..6f43cde7 100644
--- a/ws2p/Cargo.toml
+++ b/ws2p/Cargo.toml
@@ -12,7 +12,7 @@ path = "lib.rs"
bincode = "1.0.*"
duniter-conf= { path = "../conf" }
dup-crypto = "0.4.0-b1"
-duniter-documents = { path = "../documents" }
+dubp-documents = { path = "../documents" }
durs-network-documents = { path = "../network-documents" }
durs-ws2p-messages = { path = "../ws2p-messages" }
duniter-message= { path = "../message" }
diff --git a/ws2p/generate_peer.rs b/ws2p/generate_peer.rs
index 65340f64..03b027b1 100644
--- a/ws2p/generate_peer.rs
+++ b/ws2p/generate_peer.rs
@@ -16,7 +16,7 @@
//! Generate self peer card
use bincode;
-use duniter_documents::{Blockstamp, CurrencyName};
+use dubp_documents::{Blockstamp, CurrencyName};
use dup_crypto::keys::PubKey;
use durs_network_documents::network_endpoint::*;
use durs_network_documents::network_peer::*;
diff --git a/ws2p/lib.rs b/ws2p/lib.rs
index b3c80830..4e1ba400 100644
--- a/ws2p/lib.rs
+++ b/ws2p/lib.rs
@@ -35,8 +35,8 @@ extern crate serde_derive;
extern crate structopt;
extern crate bincode;
+extern crate dubp_documents;
extern crate duniter_conf;
-extern crate duniter_documents;
extern crate duniter_message;
extern crate duniter_module;
extern crate duniter_network;
--
GitLab