Include node identity in the P2P advertised client version. (#8830)
This commit is contained in:
parent
6004c394d6
commit
6f11621734
@ -756,7 +756,15 @@ impl Configuration {
|
|||||||
ret.config_path = Some(net_path.to_str().unwrap().to_owned());
|
ret.config_path = Some(net_path.to_str().unwrap().to_owned());
|
||||||
ret.reserved_nodes = self.init_reserved_nodes()?;
|
ret.reserved_nodes = self.init_reserved_nodes()?;
|
||||||
ret.allow_non_reserved = !self.args.flag_reserved_only;
|
ret.allow_non_reserved = !self.args.flag_reserved_only;
|
||||||
ret.client_version = version();
|
ret.client_version = {
|
||||||
|
let mut client_version = version();
|
||||||
|
if !self.args.arg_identity.is_empty() {
|
||||||
|
// Insert name after the "Parity/" at the beginning of version string.
|
||||||
|
let idx = client_version.find('/').unwrap_or(client_version.len());
|
||||||
|
client_version.insert_str(idx, &format!("/{}", self.args.arg_identity));
|
||||||
|
}
|
||||||
|
client_version
|
||||||
|
};
|
||||||
Ok(ret)
|
Ok(ret)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1790,6 +1798,19 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_identity_arg() {
|
||||||
|
let args = vec!["parity", "--identity", "Somebody"];
|
||||||
|
let conf = Configuration::parse_cli(&args).unwrap();
|
||||||
|
match conf.into_command().unwrap().cmd {
|
||||||
|
Cmd::Run(c) => {
|
||||||
|
assert_eq!(c.name, "Somebody");
|
||||||
|
assert!(c.net_conf.client_version.starts_with("Parity/Somebody/"));
|
||||||
|
}
|
||||||
|
_ => panic!("Should be Cmd::Run"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn should_apply_ports_shift() {
|
fn should_apply_ports_shift() {
|
||||||
// given
|
// given
|
||||||
|
Loading…
Reference in New Issue
Block a user