Merge pull request #3306 from iosh/cli

add verison and fix error

Author: Pana

bins/conflux/src/command/rpc.rs

@@ -25,8 +25,9 @@ impl RpcCommand {
             None => return Err(String::from("RPC URL not specified")),
         };
 
-        let args: Vec<Value> = match matches.get_many::<String>("rpc-args") {
-            Some(args) => {
+        let args: Vec<Value> = match matches.try_get_many::<String>("rpc-args")
+        {
+            Ok(Some(args)) => {
                 let mut params = Vec::new();
 
                 for arg in args {
@@ -37,7 +38,8 @@ impl RpcCommand {
                 }
                 params
             }
-            None => Vec::new(),
+            Ok(None) => Vec::new(),
+            Err(_e) => Vec::new(),
         };
 
         Ok(Some(RpcCommand {
@@ -136,6 +138,8 @@ impl<'a> ArgSchema<'a> {
 #[cfg(test)]
 
 mod tests {
+    use std::vec;
+
     use crate::cli::Cli;
 
     use super::*;
@@ -308,6 +312,28 @@ mod tests {
                 expected_url: "http://localhost:12539",
                 expected_params: vec![json!("0x654321fedcba"), json!(false)],
             },
+            TestCase {
+                name: "voting_status",
+                args: vec!["conflux", "rpc", "local", "pos", "voting_status"],
+                expected_method: "test_posVotingStatus",
+                expected_params: vec![],
+                expected_url: "http://localhost:12539",
+            },
+            TestCase {
+                name: "voting_status_with_custom_url",
+                args: vec![
+                    "conflux",
+                    "rpc",
+                    "local",
+                    "pos",
+                    "voting_status",
+                    "--url",
+                    "http://localhost:9999",
+                ],
+                expected_method: "test_posVotingStatus",
+                expected_params: vec![],
+                expected_url: "http://localhost:9999",
+            },
         ];
 
         for test_case in test_cases {

bins/conflux/src/main.rs

@@ -28,7 +28,13 @@ use log4rs::{
 };
 use network::throttling::THROTTLING_SERVICE;
 use parking_lot::{Condvar, Mutex};
-use std::sync::Arc;
+use std::sync::{Arc, OnceLock};
+
+static VERSION: OnceLock<String> = OnceLock::new();
+
+fn get_version() -> &'static str {
+    VERSION.get_or_init(|| parity_version::version(crate_version!()))
+}
 
 fn main() -> Result<(), String> {
     #[cfg(feature = "deadlock-detection")]
@@ -56,8 +62,7 @@ fn main() -> Result<(), String> {
         });
     } // only for #[cfg]
 
-    let version = parity_version::version(crate_version!());
-    let matches = Cli::command().get_matches();
+    let matches = Cli::command().version(get_version()).get_matches();
 
     if let Some(output) = handle_sub_command(&matches)? {
         println!("{}", output);
@@ -88,7 +93,7 @@ fn main() -> Result<(), String> {
 :......::::.......:::..::::..::..::::::::........:::.......:::..:::::..::
 Current Version: {}
 ",
-        version
+        get_version()
     );
 
     let client_handle: Box<dyn ClientTrait>;