From 130d004e79a1440e3d810ef35082f9671dc1ad81 Mon Sep 17 00:00:00 2001 From: Michael Mallan Date: Fri, 10 Jan 2025 17:01:37 +0000 Subject: [PATCH] refactor: do not include cache in message We already have access to the cache in the `update` arguments. --- liana-gui/src/app/message.rs | 2 +- liana-gui/src/app/mod.rs | 2 +- liana-gui/src/app/state/mod.rs | 2 +- liana-gui/src/app/state/settings/bitcoind.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/liana-gui/src/app/message.rs b/liana-gui/src/app/message.rs index 676446ac..dad49c93 100644 --- a/liana-gui/src/app/message.rs +++ b/liana-gui/src/app/message.rs @@ -19,7 +19,7 @@ use crate::{ pub enum Message { Tick, UpdateCache(Result), - UpdatePanelCache(/* is current panel */ bool, Result), + UpdatePanelCache(/* is current panel */ bool), View(view::Message), LoadDaemonConfig(Box), DaemonConfigLoaded(Result<(), Error>), diff --git a/liana-gui/src/app/mod.rs b/liana-gui/src/app/mod.rs index cbfbb026..0b72b382 100644 --- a/liana-gui/src/app/mod.rs +++ b/liana-gui/src/app/mod.rs @@ -327,7 +327,7 @@ impl App { panel.update( daemon.clone(), &cache, - Message::UpdatePanelCache(current == menu, Ok(cache.clone())), + Message::UpdatePanelCache(current == menu), ) }) .collect(); diff --git a/liana-gui/src/app/state/mod.rs b/liana-gui/src/app/state/mod.rs index d4f637b3..b848d019 100644 --- a/liana-gui/src/app/state/mod.rs +++ b/liana-gui/src/app/state/mod.rs @@ -254,7 +254,7 @@ impl State for Home { } } }, - Message::UpdatePanelCache(is_current, Ok(cache)) => { + Message::UpdatePanelCache(is_current) => { let wallet_was_syncing = !self.sync_status.is_synced(); self.sync_status = sync_status( daemon.backend(), diff --git a/liana-gui/src/app/state/settings/bitcoind.rs b/liana-gui/src/app/state/settings/bitcoind.rs index 0c740e77..f824efea 100644 --- a/liana-gui/src/app/state/settings/bitcoind.rs +++ b/liana-gui/src/app/state/settings/bitcoind.rs @@ -136,7 +136,7 @@ impl State for BitcoindSettingsState { self.rescan_settings.past_possible_height = true; self.rescan_settings.processing = false; } - Message::UpdatePanelCache(_, Ok(_)) => { + Message::UpdatePanelCache(_) => { self.rescan_settings.processing = cache.rescan_progress.is_some_and(|p| p < 1.0); } Message::View(view::Message::Settings(view::SettingsMessage::BitcoindSettings(