diff --git a/doc/en/dev/developing-a-durs-module.md b/doc/en/dev/developing-a-durs-module.md index 85ab4b4bfb475e9af70883d8bff037224ec510b1..8c31808aa3edc7f55889dbd9807eaf1d03666650 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 d3ab23584b869f3d465c0e78976fa93f7105ac3c..bd55a38ff557f68c1d5a778d5e16bb94d23a20d5 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 f1769b0abda059b38f0b71348782a7e4153470a8..24178da4dc148208359931a7a55f4ad0203d2f42 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 e3fa7f66d5b7e5bf700b8dcc48c86349a5522842..f0a90268685509920114d66d6be5238a97cf0fd2 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 32fe70d468f005fdecad91e59e0ae1bd1cfaee56..2e9d1264f46b60a8137208bb0d1a576369b9351c 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 8f3465c7a8deb90a4662c4f40221fa343425b065..d5b00ee852b947168083e016a9f19f3b4890fa68 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 1a28d0a49976e05d3826c2e4a94083b16c54a4cc..8379da4fc0641df9e195cd95a59c489d16df9e3a 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 851e91c9841f95cce1c50d9a20c78612e774374e..6898759f415d9b7bcb2ce97524cfce99fc1ac954 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