From 4dca5d003ae8335a26a19216b16de6f88502d61d Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Thu, 30 Jan 2020 21:57:24 +0100
Subject: [PATCH] [ref] conf: ModulePriority remove () on unit variants
---
doc/en/dev/developing-a-durs-module.md | 2 +-
doc/fr/developpeurs/developper-un-module-durs.md | 2 +-
lib/core/module/src/lib.rs | 15 +++++++++------
lib/modules/gva/src/lib.rs | 2 +-
lib/modules/skeleton/lib.rs | 4 ++--
lib/modules/tui/tui.rs | 2 +-
lib/modules/ws2p-v1-legacy/src/lib.rs | 2 +-
lib/modules/ws2p/ws2p/src/lib.rs | 2 +-
8 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/doc/en/dev/developing-a-durs-module.md b/doc/en/dev/developing-a-durs-module.md
index 85ab4b4b..8c31808a 100644
--- a/doc/en/dev/developing-a-durs-module.md
+++ b/doc/en/dev/developing-a-durs-module.md
@@ -159,7 +159,7 @@ You just have to choose one of the three variants and return it. For example, if
```rust
fn priority() -> ModulePriority {
- ModulePriority::Optional()
+ ModulePriority::Optional
}
```
diff --git a/doc/fr/developpeurs/developper-un-module-durs.md b/doc/fr/developpeurs/developper-un-module-durs.md
index d3ab2358..bd55a38f 100644
--- a/doc/fr/developpeurs/developper-un-module-durs.md
+++ b/doc/fr/developpeurs/developper-un-module-durs.md
@@ -168,7 +168,7 @@ Il suffit de choisir la variante de l'énumération qui vous convient puis de la
```rust
fn priority() -> ModulePriority {
- ModulePriority::Optional()
+ ModulePriority::Optional
}
```
diff --git a/lib/core/module/src/lib.rs b/lib/core/module/src/lib.rs
index f1769b0a..24178da4 100644
--- a/lib/core/module/src/lib.rs
+++ b/lib/core/module/src/lib.rs
@@ -33,6 +33,9 @@
#[macro_use]
extern crate serde_derive;
+#[cfg(feature = "module-test")]
+pub mod module_test;
+
use dubp_currency_params::CurrencyName;
use dup_crypto::keys::{KeyPair, KeyPairEnum, Signator};
use durs_common_tools::fatal_error;
@@ -295,11 +298,11 @@ pub enum RequiredKeysContent {
/// Defined the priority level of the module
pub enum ModulePriority {
/// This module is necessary for Duniter-Rs to work properly, impossible to disable it.
- Essential(),
+ Essential,
/// This module is recommended but it's not essential, it's enabled by default but can be disabled by the user.
- Recommended(),
+ Recommended,
/// This module is disabled by default, it must be explicitly enabled by the user.
- Optional(),
+ Optional,
}
/// Determines if a module is activated or not
@@ -307,9 +310,9 @@ pub fn enabled<DC: DursConfTrait, Mess: ModuleMessage, M: DursModule<DC, Mess>>(
let disabled_modules = conf.disabled_modules();
let enabled_modules = conf.enabled_modules();
match M::priority() {
- ModulePriority::Essential() => true,
- ModulePriority::Recommended() => !disabled_modules.contains(&ModuleName::from(M::name())),
- ModulePriority::Optional() => enabled_modules.contains(&ModuleName::from(M::name())),
+ ModulePriority::Essential => true,
+ ModulePriority::Recommended => !disabled_modules.contains(&ModuleName::from(M::name())),
+ ModulePriority::Optional => enabled_modules.contains(&ModuleName::from(M::name())),
}
}
diff --git a/lib/modules/gva/src/lib.rs b/lib/modules/gva/src/lib.rs
index e3fa7f66..f0a90268 100644
--- a/lib/modules/gva/src/lib.rs
+++ b/lib/modules/gva/src/lib.rs
@@ -150,7 +150,7 @@ impl DursModule<DuRsConf, DursMsg> for GvaModule {
ModuleStaticName(MODULE_NAME)
}
fn priority() -> ModulePriority {
- ModulePriority::Recommended()
+ ModulePriority::Recommended
}
fn ask_required_keys() -> RequiredKeys {
RequiredKeys::None
diff --git a/lib/modules/skeleton/lib.rs b/lib/modules/skeleton/lib.rs
index 32fe70d4..2e9d1264 100644
--- a/lib/modules/skeleton/lib.rs
+++ b/lib/modules/skeleton/lib.rs
@@ -127,8 +127,8 @@ impl DursModule<DuRsConf, DursMsg> for SkeletonModule {
ModuleStaticName(MODULE_NAME)
}
fn priority() -> ModulePriority {
- //ModulePriority::Recommended()
- ModulePriority::Optional()
+ //ModulePriority::Recommended
+ ModulePriority::Optional
}
fn ask_required_keys() -> RequiredKeys {
RequiredKeys::None
diff --git a/lib/modules/tui/tui.rs b/lib/modules/tui/tui.rs
index 8f3465c7..d5b00ee8 100644
--- a/lib/modules/tui/tui.rs
+++ b/lib/modules/tui/tui.rs
@@ -376,7 +376,7 @@ impl DursModule<DuRsConf, DursMsg> for TuiModule {
ModuleStaticName("tui")
}
fn priority() -> ModulePriority {
- ModulePriority::Recommended()
+ ModulePriority::Recommended
}
fn ask_required_keys() -> RequiredKeys {
RequiredKeys::None
diff --git a/lib/modules/ws2p-v1-legacy/src/lib.rs b/lib/modules/ws2p-v1-legacy/src/lib.rs
index 1a28d0a4..8379da4f 100644
--- a/lib/modules/ws2p-v1-legacy/src/lib.rs
+++ b/lib/modules/ws2p-v1-legacy/src/lib.rs
@@ -420,7 +420,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2Pv1Module {
ModuleStaticName(MODULE_NAME)
}
fn priority() -> ModulePriority {
- ModulePriority::Essential()
+ ModulePriority::Essential
}
fn ask_required_keys() -> RequiredKeys {
RequiredKeys::NetworkKeyPair
diff --git a/lib/modules/ws2p/ws2p/src/lib.rs b/lib/modules/ws2p/ws2p/src/lib.rs
index 851e91c9..6898759f 100644
--- a/lib/modules/ws2p/ws2p/src/lib.rs
+++ b/lib/modules/ws2p/ws2p/src/lib.rs
@@ -167,7 +167,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule {
ModuleStaticName(constants::MODULE_NAME)
}
fn priority() -> ModulePriority {
- ModulePriority::Essential()
+ ModulePriority::Essential
}
fn ask_required_keys() -> RequiredKeys {
RequiredKeys::NetworkKeyPair
--
GitLab