Skip to content
Snippets Groups Projects
Commit 608fb2c0 authored by Éloïs's avatar Éloïs
Browse files

[fix] module RequiredKeys : force same algo

parent 24d56663
No related branches found
No related tags found
1 merge request!58Resolve "Add crates blockchain, conf, core, dal, message, module, network, tui and ws2p"
......@@ -139,7 +139,7 @@ impl BlockchainModule {
/// Loading blockchain configuration
pub fn load_blockchain_conf(
conf: &DuniterConf,
_keys: RequiredKeysContent<ed25519::PublicKey, ed25519::KeyPair>,
_keys: RequiredKeysContent<ed25519::KeyPair>,
sync: bool,
) -> BlockchainModule {
// Get db path
......
......@@ -89,7 +89,7 @@ impl DuniterKeyPairs {
pub fn get_required_keys_content(
required_keys: RequiredKeys,
keypairs: DuniterKeyPairs,
) -> RequiredKeysContent<ed25519::PublicKey, ed25519::KeyPair> {
) -> RequiredKeysContent<ed25519::KeyPair> {
match required_keys {
RequiredKeys::MemberKeyPair() => {
RequiredKeysContent::MemberKeyPair(keypairs.member_keypair)
......
......@@ -199,7 +199,7 @@ impl DuniterCore {
}
}
/// Plug a module
pub fn plug<M: DuniterModule<ed25519::PublicKey, ed25519::KeyPair, DuniterMessage>>(&mut self) {
pub fn plug<M: DuniterModule<ed25519::KeyPair, DuniterMessage>>(&mut self) {
if self.start {
// Start module in a new thread
let soft_name_clone = self.soft_name.clone();
......
......@@ -27,7 +27,7 @@ extern crate duniter_crypto;
extern crate serde;
extern crate serde_json;
use duniter_crypto::keys::{KeyPair, PublicKey};
use duniter_crypto::keys::KeyPair;
use serde::ser::{Serialize, SerializeStruct, Serializer};
use std::fmt::Debug;
use std::sync::mpsc;
......@@ -227,15 +227,15 @@ pub enum RequiredKeys {
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
/// Contains the keys the module needs
pub enum RequiredKeysContent<P: PublicKey, K: KeyPair> {
pub enum RequiredKeysContent<K: KeyPair> {
/// Contains the member keypair (private key included).
MemberKeyPair(Option<K>),
/// Contains the member public key.
MemberPublicKey(Option<P>),
MemberPublicKey(Option<K::PublicKey>),
/// Contains the network keypair (private key included).
NetworkKeyPair(K),
/// Contains the network public key.
NetworkPublicKey(P),
NetworkPublicKey(K::PublicKey),
/// Does not contain any keys
None(),
}
......@@ -252,7 +252,7 @@ pub enum ModulePriority {
}
/// All Duniter-rs modules must implement this trait.
pub trait DuniterModule<P: PublicKey, K: KeyPair, M: ModuleMessage> {
pub trait DuniterModule<K: KeyPair, M: ModuleMessage> {
/// Returns the module identifier
fn id() -> ModuleId;
/// Returns the module priority
......@@ -265,7 +265,7 @@ pub trait DuniterModule<P: PublicKey, K: KeyPair, M: ModuleMessage> {
fn start(
soft_name: &str,
soft_version: &str,
keys: RequiredKeysContent<P, K>,
keys: RequiredKeysContent<K>,
conf: &DuniterConf,
module_conf: &serde_json::Value,
main_sender: mpsc::Sender<RooterThreadMessage<M>>,
......
......@@ -368,7 +368,7 @@ impl Default for TuiModule {
}
}
impl DuniterModule<ed25519::PublicKey, ed25519::KeyPair, DuniterMessage> for TuiModule {
impl DuniterModule<ed25519::KeyPair, DuniterMessage> for TuiModule {
fn id() -> ModuleId {
ModuleId::Str("tui")
}
......@@ -384,7 +384,7 @@ impl DuniterModule<ed25519::PublicKey, ed25519::KeyPair, DuniterMessage> for Tui
fn start(
_soft_name: &str,
_soft_version: &str,
_keys: RequiredKeysContent<ed25519::PublicKey, ed25519::KeyPair>,
_keys: RequiredKeysContent<ed25519::KeyPair>,
_conf: &DuniterConf,
module_conf: &serde_json::Value,
main_sender: mpsc::Sender<RooterThreadMessage<DuniterMessage>>,
......
......@@ -185,7 +185,7 @@ impl Default for WS2PModule {
}
}
impl DuniterModule<ed25519::PublicKey, ed25519::KeyPair, DuniterMessage> for WS2PModule {
impl DuniterModule<ed25519::KeyPair, DuniterMessage> for WS2PModule {
fn id() -> ModuleId {
ModuleId::Str("ws2p")
}
......@@ -206,7 +206,7 @@ impl DuniterModule<ed25519::PublicKey, ed25519::KeyPair, DuniterMessage> for WS2
fn start(
soft_name: &str,
soft_version: &str,
keys: RequiredKeysContent<ed25519::PublicKey, ed25519::KeyPair>,
keys: RequiredKeysContent<ed25519::KeyPair>,
duniter_conf: &DuniterConf,
module_conf: &serde_json::Value,
rooter_sender: mpsc::Sender<RooterThreadMessage<DuniterMessage>>,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment