blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup

This commit is contained in:
Greg Fitzgerald 2018-03-20 17:32:02 -06:00
parent d0e7450389
commit bff32bf7bc
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plan.rs
View File

@ -86,22 +86,12 @@ impl Plan {
/// Apply a witness to the spending plan to see if the plan can be reduced.
/// If so, modify the plan in-place.
pub fn apply_witness(&mut self, witness: Witness) {
let mut new_payment = None;
match *self {
Plan::Pay(_) => (),
Plan::After(ref cond, ref payment) => {
if cond.is_satisfied(&witness) {
new_payment = Some(payment.clone());
}
}
Plan::Race(ref a, ref b) => {
if a.0.is_satisfied(&witness) {
new_payment = Some(a.1.clone());
} else if b.0.is_satisfied(&witness) {
new_payment = Some(b.1.clone());
}
}
}
let new_payment = match *self {
Plan::After(ref cond, ref payment) if cond.is_satisfied(&witness) => Some(payment),
Plan::Race((ref cond, ref payment), _) if cond.is_satisfied(&witness) => Some(payment),
Plan::Race(_, (ref cond, ref payment)) if cond.is_satisfied(&witness) => Some(payment),
_ => None,
}.map(|x| x.clone());
if let Some(payment) = new_payment {
mem::replace(self, Plan::Pay(payment));