Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 11:31:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor refactor of OutputData mark_* functions

Browse source
This commit is contained in:
Ignotus Peverell 2018-05-22 21:39:32 +01:00
parent 662db27ba4
commit 257b6bf05a
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
2 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
wallet/src/checker.rs
View file

@ -26,26 +26,6 @@ use util::secp::pedersen;
use util;
use util::LOGGER;
// Transitions a local wallet output from Unconfirmed -> Unspent.
fn mark_unspent_output(out: &mut OutputData) {
match out.status {
OutputStatus::Unconfirmed => out.status = OutputStatus::Unspent,
_ => (),
}
}
// Transitions a local wallet output (based on it not being in the node output
// set) -
// Unspent -> Spent
// Locked -> Spent
fn mark_spent_output(out: &mut OutputData) {
match out.status {
OutputStatus::Unspent => out.status = OutputStatus::Spent,
OutputStatus::Locked => out.status = OutputStatus::Spent,
_ => (),
}
}
pub fn refresh_outputs(config: &WalletConfig, keychain: &Keychain) -> Result<(), Error> {
refresh_output_state(config, keychain)?;
refresh_missing_block_hashes(config, keychain)?;
@ -211,8 +191,8 @@ pub fn apply_api_outputs(
let id = wallet_outputs.get(&commit).unwrap();
if let Entry::Occupied(mut output) = wallet_data.outputs.entry(id.to_hex()) {
match api_outputs.get(&commit) {
Some(_) => mark_unspent_output(&mut output.get_mut()),
None => mark_spent_output(&mut output.get_mut()),
Some(_) => output.get_mut().mark_unspent(),
None => output.get_mut().mark_spent(),
};
}
}

16
wallet/src/types.rs
View file

@ -394,6 +394,22 @@ impl OutputData {
return false;
}
}
/// Marks this output as unspent if it was previously unconfirmed
pub fn mark_unspent(&mut self) {
match self.status {
OutputStatus::Unconfirmed => self.status = OutputStatus::Unspent,
_ => (),
}
}
pub fn mark_spent(&mut self) {
match self.status {
OutputStatus::Unspent => self.status = OutputStatus::Spent,
OutputStatus::Locked => self.status = OutputStatus::Spent,
_ => (),
}
}
}
#[derive(Clone, PartialEq)]