From 1b33e74a7a8b1d185a3aaea84a3ec6520ee05976 Mon Sep 17 00:00:00 2001 From: Michael Mallan Date: Fri, 20 Dec 2024 14:58:53 +0000 Subject: [PATCH] refactor: add `coin_is_owned` method --- liana-gui/src/app/state/mod.rs | 4 ++-- liana-gui/src/daemon/model.rs | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/liana-gui/src/app/state/mod.rs b/liana-gui/src/app/state/mod.rs index 19a1d59d..e76c274b 100644 --- a/liana-gui/src/app/state/mod.rs +++ b/liana-gui/src/app/state/mod.rs @@ -29,7 +29,7 @@ use super::{ pub const HISTORY_EVENT_PAGE_SIZE: u64 = 20; -use crate::daemon::model::LabelsLoader; +use crate::daemon::model::{coin_is_owned, LabelsLoader}; use crate::daemon::{ model::{remaining_sequence, Coin, HistoryTransaction, Payment}, Daemon, @@ -94,7 +94,7 @@ fn coins_summary( for coin in coins { if coin.spend_info.is_none() { // Include unconfirmed coins from self in confirmed balance. - if coin.block_height.is_some() || coin.is_from_self { + if coin_is_owned(coin) { balance += coin.amount; // Only consider confirmed coins for remaining seq // (they would not be considered as expiring so we can also skip that part) diff --git a/liana-gui/src/daemon/model.rs b/liana-gui/src/daemon/model.rs index c4657ba9..9bbb0b94 100644 --- a/liana-gui/src/daemon/model.rs +++ b/liana-gui/src/daemon/model.rs @@ -29,6 +29,13 @@ pub fn remaining_sequence(coin: &Coin, blockheight: u32, timelock: u16) -> u32 { } } +/// Whether the coin is owned by this wallet. +/// This comprises all confirmed coins together with those +/// unconfirmed coins from self. +pub fn coin_is_owned(coin: &Coin) -> bool { + coin.block_height.is_some() || coin.is_from_self +} + #[derive(Debug, Clone)] pub struct SpendTx { pub network: Network,