From 9de2e22e5a28dfda906b22ed624ac476b9b47113 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Sat, 12 May 2018 18:45:06 +0200
Subject: [PATCH] [fix] errors in regexs and parsers
---
crypto/keys/ed25519.rs | 1 -
documents/blockchain/v10/documents/certification.rs | 4 ++--
documents/blockchain/v10/documents/identity.rs | 4 ++--
documents/blockchain/v10/documents/membership.rs | 4 ++--
documents/blockchain/v10/documents/revocation.rs | 4 ++--
documents/blockchain/v10/documents/transaction.rs | 6 ++----
wotb/data/legacy.rs | 2 ++
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/crypto/keys/ed25519.rs b/crypto/keys/ed25519.rs
index 7adbffe2..9fe98d04 100644
--- a/crypto/keys/ed25519.rs
+++ b/crypto/keys/ed25519.rs
@@ -33,7 +33,6 @@ use base58::{FromBase58, FromBase58Error, ToBase58};
use base64;
use base64::DecodeError;
use crypto;
-use self::serde::ser::{Serialize, Serializer};
use super::{BaseConvertionError, PrivateKey as PrivateKeyMethods, PublicKey as PublicKeyMethods};
diff --git a/documents/blockchain/v10/documents/certification.rs b/documents/blockchain/v10/documents/certification.rs
index 8ab4a215..b3e8857c 100644
--- a/documents/blockchain/v10/documents/certification.rs
+++ b/documents/blockchain/v10/documents/certification.rs
@@ -17,9 +17,9 @@
extern crate serde;
-use duniter_crypto::keys::{PublicKey, Signature, ed25519};
-use regex::Regex;
use self::serde::ser::{Serialize, Serializer};
+use duniter_crypto::keys::{ed25519, PublicKey, Signature};
+use regex::Regex;
use blockchain::v10::documents::{
StandardTextDocumentParser, TextDocument, TextDocumentBuilder, V10Document,
diff --git a/documents/blockchain/v10/documents/identity.rs b/documents/blockchain/v10/documents/identity.rs
index 4cc4f04e..6e986565 100644
--- a/documents/blockchain/v10/documents/identity.rs
+++ b/documents/blockchain/v10/documents/identity.rs
@@ -17,9 +17,9 @@
extern crate serde;
-use duniter_crypto::keys::{PublicKey, ed25519};
-use regex::Regex;
use self::serde::ser::{Serialize, Serializer};
+use duniter_crypto::keys::{ed25519, PublicKey};
+use regex::Regex;
use blockchain::v10::documents::{
StandardTextDocumentParser, TextDocument, TextDocumentBuilder, V10Document,
diff --git a/documents/blockchain/v10/documents/membership.rs b/documents/blockchain/v10/documents/membership.rs
index ff31ace7..0cc53d51 100644
--- a/documents/blockchain/v10/documents/membership.rs
+++ b/documents/blockchain/v10/documents/membership.rs
@@ -17,9 +17,9 @@
extern crate serde;
-use duniter_crypto::keys::{PublicKey, ed25519};
-use regex::Regex;
use self::serde::ser::{Serialize, Serializer};
+use duniter_crypto::keys::{ed25519, PublicKey};
+use regex::Regex;
use blockchain::v10::documents::{
StandardTextDocumentParser, TextDocument, TextDocumentBuilder, V10Document,
diff --git a/documents/blockchain/v10/documents/revocation.rs b/documents/blockchain/v10/documents/revocation.rs
index fad5d99a..b954ae13 100644
--- a/documents/blockchain/v10/documents/revocation.rs
+++ b/documents/blockchain/v10/documents/revocation.rs
@@ -17,9 +17,9 @@
extern crate serde;
-use duniter_crypto::keys::{PublicKey, Signature, ed25519};
-use regex::Regex;
use self::serde::ser::{Serialize, Serializer};
+use duniter_crypto::keys::{ed25519, PublicKey, Signature};
+use regex::Regex;
use blockchain::v10::documents::{
StandardTextDocumentParser, TextDocument, TextDocumentBuilder, V10Document,
diff --git a/documents/blockchain/v10/documents/transaction.rs b/documents/blockchain/v10/documents/transaction.rs
index efcf04a7..49dd27ba 100644
--- a/documents/blockchain/v10/documents/transaction.rs
+++ b/documents/blockchain/v10/documents/transaction.rs
@@ -25,10 +25,8 @@ use regex::RegexBuilder;
use self::serde::ser::{Serialize, Serializer};
-use blockchain::v10::documents::{
- StandardTextDocumentParser, TextDocument, TextDocumentBuilder, V10Document,
- V10DocumentParsingError,
-};
+use blockchain::v10::documents::{StandardTextDocumentParser, TextDocument, TextDocumentBuilder,
+ V10Document, V10DocumentParsingError};
use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
use Blockstamp;
diff --git a/wotb/data/legacy.rs b/wotb/data/legacy.rs
index 202807a2..ae0efc3f 100644
--- a/wotb/data/legacy.rs
+++ b/wotb/data/legacy.rs
@@ -20,6 +20,8 @@ use std::collections::hash_set::Iter;
use std::collections::HashSet;
use std::fs::File;
use std::io::prelude::*;
+use std::rc::Rc;
+use WotDistance;
use bincode::{deserialize, serialize, Infinite};
--
GitLab