diff --git a/doc/en/dev/developing-a-durs-module.md b/doc/en/dev/developing-a-durs-module.md index d27edfa0621406d6994575d13144e6e7f5095f66..85ab4b4bfb475e9af70883d8bff037224ec510b1 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 f8da69ff816a42f7933f069d299161766c48a3be..d3ab23584b869f3d465c0e78976fa93f7105ac3c 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 6c6f2efbad135581030e3ee0a7cdf4b197008578..2d34ba9cf8b15b20a33fa9e8adf10e720b361478 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 df8a38fe3f09143c37656eb55ca121ef88f02678..f1769b0abda059b38f0b71348782a7e4153470a8 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 16666c20f51c5753d29e14dec0b9e47a35e24d0b..e3fa7f66d5b7e5bf700b8dcc48c86349a5522842 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 d727bc9e6e538b665b1635cdd0c8d010666e375d..32fe70d468f005fdecad91e59e0ae1bd1cfaee56 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 0b46c041e785c5ad617aba29149a2999cd913e4c..8f3465c7a8deb90a4662c4f40221fa343425b065 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 0210c22e7fe7b18576a09bdb8d9fd4d676ac5dfb..1a28d0a49976e05d3826c2e4a94083b16c54a4cc 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 d5a04174b4b051c64c4797c209d1e1b57c288c79..851e91c9841f95cce1c50d9a20c78612e774374e 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