nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui(installer): extract logic for try ping bitcoind

Browse Source
This commit is contained in:
Michael Mallan 2024-08-28 11:34:50 +01:00
parent ef44cf329a
commit 4536eff561
No known key found for this signature in database
GPG Key ID: 5177CDCEDB0EABEB
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gui/src/installer/step/node/bitcoind.rs
View File

@ -392,6 +392,16 @@ impl DefineBitcoind {
|res| Message::DefineBitcoind(message::DefineBitcoind::PingBitcoindResult(res)),
)
}
pub fn can_try_ping(&self) -> bool {
if let RpcAuthType::UserPass = self.selected_auth_type {
self.address.valid
&& !self.rpc_auth_vals.password.value.is_empty()
&& !self.rpc_auth_vals.user.value.is_empty()
} else {
self.address.valid && !self.rpc_auth_vals.cookie_path.value.is_empty()
}
}
}
impl Step for DefineBitcoind {
@ -503,6 +513,7 @@ impl Step for DefineBitcoind {
&self.rpc_auth_vals,
&self.selected_auth_type,
self.is_running.as_ref(),
self.can_try_ping(),
)
}

10
gui/src/installer/view.rs
View File

@ -1165,6 +1165,7 @@ pub fn define_bitcoin<'a>(
rpc_auth_vals: &RpcAuthValues,
selected_auth_type: &RpcAuthType,
is_running: Option<&Result<(), Error>>,
can_try_ping: bool,
) -> Element<'a, Message> {
let is_loopback = if let Some((ip, _port)) = address.value.clone().rsplit_once(':') {
let (ipv4, ipv6) = (Ipv4Addr::from_str(ip), Ipv6Addr::from_str(ip));
@ -1268,13 +1269,6 @@ pub fn define_bitcoin<'a>(
})
.spacing(10);
let check_connect_enable = if let RpcAuthType::UserPass = selected_auth_type {
address.valid
&& !rpc_auth_vals.password.value.is_empty()
&& !rpc_auth_vals.user.value.is_empty()
} else {
address.valid && !rpc_auth_vals.cookie_path.value.is_empty()
};
layout(
progress,
None,
@ -1310,7 +1304,7 @@ pub fn define_bitcoin<'a>(
.spacing(10)
.push(Container::new(
button::secondary(None, "Check connection")
.on_press_maybe(if check_connect_enable {
.on_press_maybe(if can_try_ping {
Some(Message::DefineBitcoind(
message::DefineBitcoind::PingBitcoind,
))