From 3249aa376cc079f3f7caedd7f27933e1e6416f75 Mon Sep 17 00:00:00 2001 From: DieMyst Date: Wed, 20 Jan 2021 16:14:20 +0300 Subject: [PATCH] fmt --- identity/src/public_key.rs | 2 +- identity/src/secret_key.rs | 2 +- identity/src/signature.rs | 2 +- src/lib.rs | 4 ++-- src/public_key_hashable.rs | 7 ++++--- src/revoke.rs | 2 +- src/trust.rs | 2 +- src/trust_node.rs | 4 ++-- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/identity/src/public_key.rs b/identity/src/public_key.rs index 10273c4..be2ffa5 100644 --- a/identity/src/public_key.rs +++ b/identity/src/public_key.rs @@ -17,7 +17,7 @@ use crate::signature::Signature; use core::fmt::Debug; use ed25519_dalek::SignatureError; -use serde::{Serialize, Deserialize}; +use serde::{Deserialize, Serialize}; #[derive(Copy, Clone, Default, Eq, PartialEq, Serialize, Deserialize)] pub struct PublicKey(pub(crate) ed25519_dalek::PublicKey); diff --git a/identity/src/secret_key.rs b/identity/src/secret_key.rs index 7d89440..adc9931 100644 --- a/identity/src/secret_key.rs +++ b/identity/src/secret_key.rs @@ -15,7 +15,7 @@ */ use ed25519_dalek::SignatureError; -use serde::{Serialize, Deserialize}; +use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize)] pub struct SecretKey(ed25519_dalek::SecretKey); diff --git a/identity/src/signature.rs b/identity/src/signature.rs index 8ccacc0..650f4d4 100644 --- a/identity/src/signature.rs +++ b/identity/src/signature.rs @@ -14,8 +14,8 @@ * limitations under the License. */ +use serde::{Deserialize, Serialize}; use signature::Signature as SigSignature; -use serde::{Serialize, Deserialize}; #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub struct Signature(pub ed25519_dalek::Signature); diff --git a/src/lib.rs b/src/lib.rs index 766831a..4436f6e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -39,8 +39,8 @@ mod trust_node; pub use crate::certificate::Certificate; pub use crate::misc::current_time; pub use crate::public_key_hashable::PublicKeyHashable; -pub use crate::trust::Trust; pub use crate::revoke::Revoke; -pub use crate::trust_node::{TrustNode, Auth}; +pub use crate::trust::Trust; pub use crate::trust_graph::{TrustGraph, Weight}; pub use crate::trust_graph_storage::Storage; +pub use crate::trust_node::{Auth, TrustNode}; diff --git a/src/public_key_hashable.rs b/src/public_key_hashable.rs index 2b440fc..a01d828 100644 --- a/src/public_key_hashable.rs +++ b/src/public_key_hashable.rs @@ -18,11 +18,11 @@ use fluence_identity::public_key::PublicKey; use core::fmt; use ref_cast::RefCast; +use serde::ser::Serializer; use std::{ fmt::{Display, Formatter}, hash::{Hash, Hasher}, }; -use serde::ser::{Serializer}; /// Wrapper to use PublicKey in HashMap #[derive(PartialEq, Eq, Debug, Clone, RefCast)] @@ -82,8 +82,9 @@ impl Display for PublicKeyHashable { impl serde::Serialize for PublicKeyHashable { fn serialize(&self, serializer: S) -> Result - where - S: Serializer { + where + S: Serializer, + { serializer.serialize_bytes(&self.0.to_bytes()) } } diff --git a/src/revoke.rs b/src/revoke.rs index c9e9db8..8aa1243 100644 --- a/src/revoke.rs +++ b/src/revoke.rs @@ -18,8 +18,8 @@ use crate::trust::{EXPIRATION_LEN, PK_LEN}; use fluence_identity::key_pair::KeyPair; use fluence_identity::public_key::PublicKey; use fluence_identity::signature::Signature; +use serde::{Deserialize, Serialize}; use std::time::Duration; -use serde::{Serialize, Deserialize}; /// "A document" that cancels trust created before. /// TODO delete pk from Revoke (it is already in a trust node) diff --git a/src/trust.rs b/src/trust.rs index 1c772dc..1f46d04 100644 --- a/src/trust.rs +++ b/src/trust.rs @@ -18,9 +18,9 @@ use derivative::Derivative; use fluence_identity::key_pair::KeyPair; use fluence_identity::public_key::PublicKey; use fluence_identity::signature::Signature; +use serde::{Deserialize, Serialize}; use std::convert::TryInto; use std::time::Duration; -use serde::{Serialize, Deserialize}; pub const SIG_LEN: usize = 64; pub const PK_LEN: usize = 32; diff --git a/src/trust_node.rs b/src/trust_node.rs index fc2f7ec..c785df3 100644 --- a/src/trust_node.rs +++ b/src/trust_node.rs @@ -19,9 +19,9 @@ use crate::revoke::Revoke; use crate::trust::Trust; use failure::_core::time::Duration; use fluence_identity::public_key::PublicKey; -use std::collections::HashMap; -use serde::{Serialize, Deserialize}; +use serde::{Deserialize, Serialize}; use serde_with::serde_as; +use std::collections::HashMap; #[derive(Debug, Clone, Serialize, Deserialize)] enum TrustRelation {