Resolve "Change keypairs file to encrypted format (DEWIF)"

Closes #200

bin/dunitrust-server/src/cli.rs

@@ -15,13 +15,15 @@
 
 //! Command line options for classic Dunitrust nodes (no specialization).
 
+use durs_conf::{DuRsConf, DuniterKeyPairs};
 use durs_core::commands::dbex::DbExOpt;
 use durs_core::commands::keys::KeysOpt;
 use durs_core::commands::modules::{DisableOpt, EnableOpt, ListModulesOpt};
 use durs_core::commands::reset::ResetOpt;
 use durs_core::commands::start::StartOpt;
 use durs_core::commands::{
-    DursCommand, DursCommandEnum, DursCoreCommand, DursCoreOptions, ExecutableModuleCommand,
+    CommandNeedKeypairs, DursCommand, DursCommandEnum, DursCoreCommand, DursCoreOptions,
+    ExecutableModuleCommand,
 };
 use durs_core::errors::DursCoreError;
 use durs_core::DursCore;
@@ -62,25 +64,23 @@ pub struct DursCliOpt {
     profile_name: Option<String>,
 }
 
+impl CommandNeedKeypairs for DursCliOpt {}
+
 impl ExecutableModuleCommand for DursCliOpt {
     /// Execute command
-    fn execute_module_command(self, options: DursCoreOptions) -> Result<(), DursCoreError> {
+    fn execute_module_command(
+        self,
+        durs_core: DursCore<DuRsConf>,
+        keypairs: DuniterKeyPairs,
+    ) -> Result<(), DursCoreError> {
         match self.cmd {
             DursCliSubCommand::Ws2p1(module_opts) => {
-                DursCore::execute_module_command::<WS2Pv1Module>(
-                    options,
-                    module_opts,
-                    env!("CARGO_PKG_NAME"),
-                    env!("CARGO_PKG_VERSION"),
-                )
+                DursCore::execute_module_command::<WS2Pv1Module>(durs_core, &keypairs, module_opts)
             }
             #[cfg(not(target_arch = "arm"))]
-            DursCliSubCommand::Gva(module_opts) => DursCore::execute_module_command::<GvaModule>(
-                options,
-                module_opts,
-                env!("CARGO_PKG_NAME"),
-                env!("CARGO_PKG_VERSION"),
-            ),
+            DursCliSubCommand::Gva(module_opts) => {
+                DursCore::execute_module_command::<GvaModule>(durs_core, &keypairs, module_opts)
+            }
             _ => unreachable!(),
         }
     }