Skip to main content
Sign in
Snippets Groups Projects
Commit e0da9485 authored by Éloïs's avatar Éloïs
Browse files

[ref] conf: RequiredKeysContent remove () on unit variants

parent a3cb9863
No related branches found
No related tags found
1 merge request!256load conf from env vars as a priority
...@@ -178,7 +178,7 @@ As above, you just have to return a variant. For example, if you don't need any ...@@ -178,7 +178,7 @@ As above, you just have to return a variant. For example, if you don't need any
```rust ```rust
fn ask_required_keys() -> RequiredKeys { fn ask_required_keys() -> RequiredKeys {
RequiredKeys::None() RequiredKeys::None
} }
``` ```
... ...
......
...@@ -187,7 +187,7 @@ Il suffit de choisir la variante de l'énumération qui vous convient puis de la ...@@ -187,7 +187,7 @@ Il suffit de choisir la variante de l'énumération qui vous convient puis de la
```rust ```rust
fn ask_required_keys() -> RequiredKeys { fn ask_required_keys() -> RequiredKeys {
RequiredKeys::None() RequiredKeys::None
} }
``` ```
... ...
......
...@@ -72,23 +72,23 @@ impl DuniterKeyPairs { ...@@ -72,23 +72,23 @@ impl DuniterKeyPairs {
keypairs: DuniterKeyPairs, keypairs: DuniterKeyPairs,
) -> RequiredKeysContent { ) -> RequiredKeysContent {
match required_keys { match required_keys {
RequiredKeys::MemberKeyPair() => { RequiredKeys::MemberKeyPair => {
RequiredKeysContent::MemberKeyPair(keypairs.member_keypair) RequiredKeysContent::MemberKeyPair(keypairs.member_keypair)
} }
RequiredKeys::MemberPublicKey() => { RequiredKeys::MemberPublicKey => {
RequiredKeysContent::MemberPublicKey(if let Some(keys) = keypairs.member_keypair { RequiredKeysContent::MemberPublicKey(if let Some(keys) = keypairs.member_keypair {
Some(keys.public_key()) Some(keys.public_key())
} else { } else {
None None
}) })
} }
RequiredKeys::NetworkKeyPair() => { RequiredKeys::NetworkKeyPair => {
RequiredKeysContent::NetworkKeyPair(keypairs.network_keypair) RequiredKeysContent::NetworkKeyPair(keypairs.network_keypair)
} }
RequiredKeys::NetworkPublicKey() => { RequiredKeys::NetworkPublicKey => {
RequiredKeysContent::NetworkPublicKey(keypairs.network_keypair.public_key()) RequiredKeysContent::NetworkPublicKey(keypairs.network_keypair.public_key())
} }
RequiredKeys::None() => RequiredKeysContent::None(), RequiredKeys::None => RequiredKeysContent::None,
} }
} }
} }
... ...
......
...@@ -265,15 +265,15 @@ pub enum RouterThreadMessage<M: ModuleMessage> { ...@@ -265,15 +265,15 @@ pub enum RouterThreadMessage<M: ModuleMessage> {
/// Indicates which keys the module needs to operate /// Indicates which keys the module needs to operate
pub enum RequiredKeys { pub enum RequiredKeys {
/// The module needs the member keypair (private key included). /// The module needs the member keypair (private key included).
MemberKeyPair(), MemberKeyPair,
/// The module only needs the member public key. /// The module only needs the member public key.
MemberPublicKey(), MemberPublicKey,
/// The module needs the network keypair (private key included). /// The module needs the network keypair (private key included).
NetworkKeyPair(), NetworkKeyPair,
/// The module only needs the network public key. /// The module only needs the network public key.
NetworkPublicKey(), NetworkPublicKey,
/// The module does not need any key /// The module does not need any key
None(), None,
} }
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
...@@ -288,7 +288,7 @@ pub enum RequiredKeysContent { ...@@ -288,7 +288,7 @@ pub enum RequiredKeysContent {
/// Contains the network public key. /// Contains the network public key.
NetworkPublicKey(<<KeyPairEnum as KeyPair>::Signator as Signator>::PublicKey), NetworkPublicKey(<<KeyPairEnum as KeyPair>::Signator as Signator>::PublicKey),
/// Does not contain any keys /// Does not contain any keys
None(), None,
} }
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
...@@ -340,7 +340,7 @@ pub fn module_valid_filters< ...@@ -340,7 +340,7 @@ pub fn module_valid_filters<
return false; return false;
} }
if filters.contains(&ModulesFilter::RequireMemberPrivKey()) if filters.contains(&ModulesFilter::RequireMemberPrivKey())
&& M::ask_required_keys() != RequiredKeys::MemberKeyPair() && M::ask_required_keys() != RequiredKeys::MemberKeyPair
{ {
return false; return false;
} }
... ...
......
...@@ -153,7 +153,7 @@ impl DursModule<DuRsConf, DursMsg> for GvaModule { ...@@ -153,7 +153,7 @@ impl DursModule<DuRsConf, DursMsg> for GvaModule {
ModulePriority::Recommended() ModulePriority::Recommended()
} }
fn ask_required_keys() -> RequiredKeys { fn ask_required_keys() -> RequiredKeys {
RequiredKeys::None() RequiredKeys::None
} }
fn have_subcommand() -> bool { fn have_subcommand() -> bool {
false false
... ...
......
...@@ -131,7 +131,7 @@ impl DursModule<DuRsConf, DursMsg> for SkeletonModule { ...@@ -131,7 +131,7 @@ impl DursModule<DuRsConf, DursMsg> for SkeletonModule {
ModulePriority::Optional() ModulePriority::Optional()
} }
fn ask_required_keys() -> RequiredKeys { fn ask_required_keys() -> RequiredKeys {
RequiredKeys::None() RequiredKeys::None
} }
fn have_subcommand() -> bool { fn have_subcommand() -> bool {
true true
... ...
......
...@@ -379,7 +379,7 @@ impl DursModule<DuRsConf, DursMsg> for TuiModule { ...@@ -379,7 +379,7 @@ impl DursModule<DuRsConf, DursMsg> for TuiModule {
ModulePriority::Recommended() ModulePriority::Recommended()
} }
fn ask_required_keys() -> RequiredKeys { fn ask_required_keys() -> RequiredKeys {
RequiredKeys::None() RequiredKeys::None
} }
fn generate_module_conf( fn generate_module_conf(
_currency_name: Option<&CurrencyName>, _currency_name: Option<&CurrencyName>,
... ...
......
...@@ -423,7 +423,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2Pv1Module { ...@@ -423,7 +423,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2Pv1Module {
ModulePriority::Essential() ModulePriority::Essential()
} }
fn ask_required_keys() -> RequiredKeys { fn ask_required_keys() -> RequiredKeys {
RequiredKeys::NetworkKeyPair() RequiredKeys::NetworkKeyPair
} }
fn have_subcommand() -> bool { fn have_subcommand() -> bool {
true true
... ...
......
...@@ -170,7 +170,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule { ...@@ -170,7 +170,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule {
ModulePriority::Essential() ModulePriority::Essential()
} }
fn ask_required_keys() -> RequiredKeys { fn ask_required_keys() -> RequiredKeys {
RequiredKeys::NetworkKeyPair() RequiredKeys::NetworkKeyPair
} }
fn have_subcommand() -> bool { fn have_subcommand() -> bool {
true true
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment