Skip to content

Commit 775cb96

Browse files
committed
bump to 0.19.4
1 parent e83284f commit 775cb96

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

cita-cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cita-cli"
3-
version = "0.19.3"
3+
version = "0.19.4"
44
authors = ["piaoliu <[email protected]>", "Qian Linfeng <[email protected]>"]
55
build = "build.rs"
66
edition = "2018"

cita-cli/src/interactive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ mod test {
819819
fn test_re() {
820820
fn capture(regex: &Regex, line: &str) -> String {
821821
let replaced = regex.replace_all(line, |caps: &Captures| {
822-
format!("{}", caps.name("key").unwrap().as_str())
822+
caps.name("key").unwrap().as_str().to_string()
823823
});
824824
replaced.into_owned()
825825
}

cita-cli/src/main.rs

+18-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ const DEFAULT_JSONRPC_URL: &str = "http://127.0.0.1:1337";
3030

3131
fn main() {
3232
dotenv().ok();
33-
let version = format!("{}+{}", crate_version!(), get_commit_id());
33+
let version = format!(
34+
"{}+{}, {}",
35+
crate_version!(),
36+
get_commit_id(),
37+
feature_version()
38+
);
3439

3540
let mut env_map: HashMap<String, String> = HashMap::from_iter(env::vars());
3641
let default_jsonrpc_url = env_map
@@ -72,3 +77,15 @@ fn main() {
7277
process::exit(1);
7378
}
7479
}
80+
81+
fn feature_version() -> String {
82+
if cfg!(feature = "tls") && cfg!(feature = "ed25519") {
83+
"support tls, ed25519".to_owned()
84+
} else if cfg!(feature = "tls") {
85+
"support tls".to_owned()
86+
} else if cfg!(feature = "ed25519") {
87+
"support ed25519".to_owned()
88+
} else {
89+
"no other support".to_owned()
90+
}
91+
}

cita-tool/src/abi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ pub fn decode_logs(
221221
.map_err(|e| ToolError::Abi(format!("{}", e)))?;
222222

223223
let topics: Vec<Hash> = topics
224-
.into_iter()
224+
.iter()
225225
.map(|t| t.parse())
226226
.collect::<Result<_, _>>()
227227
.map_err(|e| ToolError::Abi(format!("{}", e)))?;

0 commit comments

Comments
 (0)