From e0da9485d886cb7d7af3f209490e86243ae89a64 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Thu, 30 Jan 2020 21:54:08 +0100
Subject: [PATCH] [ref] conf: RequiredKeysContent remove () on unit variants
---
doc/en/dev/developing-a-durs-module.md | 2 +-
doc/fr/developpeurs/developper-un-module-durs.md | 2 +-
lib/core/conf/src/keypairs.rs | 10 +++++-----
lib/core/module/src/lib.rs | 14 +++++++-------
lib/modules/gva/src/lib.rs | 2 +-
lib/modules/skeleton/lib.rs | 2 +-
lib/modules/tui/tui.rs | 2 +-
lib/modules/ws2p-v1-legacy/src/lib.rs | 2 +-
lib/modules/ws2p/ws2p/src/lib.rs | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/doc/en/dev/developing-a-durs-module.md b/doc/en/dev/developing-a-durs-module.md
index d27edfa0..85ab4b4b 100644
--- a/doc/en/dev/developing-a-durs-module.md
+++ b/doc/en/dev/developing-a-durs-module.md
@@ -178,7 +178,7 @@ As above, you just have to return a variant. For example, if you don't need any
```rust
fn ask_required_keys() -> RequiredKeys {
- RequiredKeys::None()
+ RequiredKeys::None
}
```
diff --git a/doc/fr/developpeurs/developper-un-module-durs.md b/doc/fr/developpeurs/developper-un-module-durs.md
index f8da69ff..d3ab2358 100644
--- a/doc/fr/developpeurs/developper-un-module-durs.md
+++ b/doc/fr/developpeurs/developper-un-module-durs.md
@@ -187,7 +187,7 @@ Il suffit de choisir la variante de l'énumération qui vous convient puis de la
```rust
fn ask_required_keys() -> RequiredKeys {
- RequiredKeys::None()
+ RequiredKeys::None
}
```
diff --git a/lib/core/conf/src/keypairs.rs b/lib/core/conf/src/keypairs.rs
index 6c6f2efb..2d34ba9c 100644
--- a/lib/core/conf/src/keypairs.rs
+++ b/lib/core/conf/src/keypairs.rs
@@ -72,23 +72,23 @@ impl DuniterKeyPairs {
keypairs: DuniterKeyPairs,
) -> RequiredKeysContent {
match required_keys {
- RequiredKeys::MemberKeyPair() => {
+ RequiredKeys::MemberKeyPair => {
RequiredKeysContent::MemberKeyPair(keypairs.member_keypair)
}
- RequiredKeys::MemberPublicKey() => {
+ RequiredKeys::MemberPublicKey => {
RequiredKeysContent::MemberPublicKey(if let Some(keys) = keypairs.member_keypair {
Some(keys.public_key())
} else {
None
})
}
- RequiredKeys::NetworkKeyPair() => {
+ RequiredKeys::NetworkKeyPair => {
RequiredKeysContent::NetworkKeyPair(keypairs.network_keypair)
}
- RequiredKeys::NetworkPublicKey() => {
+ RequiredKeys::NetworkPublicKey => {
RequiredKeysContent::NetworkPublicKey(keypairs.network_keypair.public_key())
}
- RequiredKeys::None() => RequiredKeysContent::None(),
+ RequiredKeys::None => RequiredKeysContent::None,
}
}
}
diff --git a/lib/core/module/src/lib.rs b/lib/core/module/src/lib.rs
index df8a38fe..f1769b0a 100644
--- a/lib/core/module/src/lib.rs
+++ b/lib/core/module/src/lib.rs
@@ -265,15 +265,15 @@ pub enum RouterThreadMessage<M: ModuleMessage> {
/// Indicates which keys the module needs to operate
pub enum RequiredKeys {
/// The module needs the member keypair (private key included).
- MemberKeyPair(),
+ MemberKeyPair,
/// The module only needs the member public key.
- MemberPublicKey(),
+ MemberPublicKey,
/// The module needs the network keypair (private key included).
- NetworkKeyPair(),
+ NetworkKeyPair,
/// The module only needs the network public key.
- NetworkPublicKey(),
+ NetworkPublicKey,
/// The module does not need any key
- None(),
+ None,
}
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -288,7 +288,7 @@ pub enum RequiredKeysContent {
/// Contains the network public key.
NetworkPublicKey(<<KeyPairEnum as KeyPair>::Signator as Signator>::PublicKey),
/// Does not contain any keys
- None(),
+ None,
}
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -340,7 +340,7 @@ pub fn module_valid_filters<
return false;
}
if filters.contains(&ModulesFilter::RequireMemberPrivKey())
- && M::ask_required_keys() != RequiredKeys::MemberKeyPair()
+ && M::ask_required_keys() != RequiredKeys::MemberKeyPair
{
return false;
}
diff --git a/lib/modules/gva/src/lib.rs b/lib/modules/gva/src/lib.rs
index 16666c20..e3fa7f66 100644
--- a/lib/modules/gva/src/lib.rs
+++ b/lib/modules/gva/src/lib.rs
@@ -153,7 +153,7 @@ impl DursModule<DuRsConf, DursMsg> for GvaModule {
ModulePriority::Recommended()
}
fn ask_required_keys() -> RequiredKeys {
- RequiredKeys::None()
+ RequiredKeys::None
}
fn have_subcommand() -> bool {
false
diff --git a/lib/modules/skeleton/lib.rs b/lib/modules/skeleton/lib.rs
index d727bc9e..32fe70d4 100644
--- a/lib/modules/skeleton/lib.rs
+++ b/lib/modules/skeleton/lib.rs
@@ -131,7 +131,7 @@ impl DursModule<DuRsConf, DursMsg> for SkeletonModule {
ModulePriority::Optional()
}
fn ask_required_keys() -> RequiredKeys {
- RequiredKeys::None()
+ RequiredKeys::None
}
fn have_subcommand() -> bool {
true
diff --git a/lib/modules/tui/tui.rs b/lib/modules/tui/tui.rs
index 0b46c041..8f3465c7 100644
--- a/lib/modules/tui/tui.rs
+++ b/lib/modules/tui/tui.rs
@@ -379,7 +379,7 @@ impl DursModule<DuRsConf, DursMsg> for TuiModule {
ModulePriority::Recommended()
}
fn ask_required_keys() -> RequiredKeys {
- RequiredKeys::None()
+ RequiredKeys::None
}
fn generate_module_conf(
_currency_name: Option<&CurrencyName>,
diff --git a/lib/modules/ws2p-v1-legacy/src/lib.rs b/lib/modules/ws2p-v1-legacy/src/lib.rs
index 0210c22e..1a28d0a4 100644
--- a/lib/modules/ws2p-v1-legacy/src/lib.rs
+++ b/lib/modules/ws2p-v1-legacy/src/lib.rs
@@ -423,7 +423,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2Pv1Module {
ModulePriority::Essential()
}
fn ask_required_keys() -> RequiredKeys {
- RequiredKeys::NetworkKeyPair()
+ RequiredKeys::NetworkKeyPair
}
fn have_subcommand() -> bool {
true
diff --git a/lib/modules/ws2p/ws2p/src/lib.rs b/lib/modules/ws2p/ws2p/src/lib.rs
index d5a04174..851e91c9 100644
--- a/lib/modules/ws2p/ws2p/src/lib.rs
+++ b/lib/modules/ws2p/ws2p/src/lib.rs
@@ -170,7 +170,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule {
ModulePriority::Essential()
}
fn ask_required_keys() -> RequiredKeys {
- RequiredKeys::NetworkKeyPair()
+ RequiredKeys::NetworkKeyPair
}
fn have_subcommand() -> bool {
true
--
GitLab