gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Race -> Or

Browse Source 
Thanks for the suggestion @FishmanL!
This commit is contained in:
Greg Fitzgerald
2018-06-07 16:47:19 -06:00
parent c2a9395a4b
commit fe7d1cb81c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/budget.rs
View File

@ -41,7 +41,7 @@ pub enum Budget {
/// Either make a payment after one condition or a different payment after another /// Either make a payment after one condition or a different payment after another
/// condition, which ever condition is satisfied first. /// condition, which ever condition is satisfied first.
Race((Condition, Payment), (Condition, Payment)), Or((Condition, Payment), (Condition, Payment)),
} }
impl Budget { impl Budget {
@ -68,7 +68,7 @@ impl Budget {
tokens: i64, tokens: i64,
to: PublicKey, to: PublicKey,
) -> Self { ) -> Self {
Budget::Race( Budget::Or(
(Condition::Timestamp(dt), Payment { tokens, to }), (Condition::Timestamp(dt), Payment { tokens, to }),
(Condition::Signature(from), Payment { tokens, to: from }), (Condition::Signature(from), Payment { tokens, to: from }),
) )
@ -88,7 +88,7 @@ impl PaymentPlan for Budget {
fn verify(&self, spendable_tokens: i64) -> bool { fn verify(&self, spendable_tokens: i64) -> bool {
match self { match self {
Budget::Pay(payment) | Budget::After(_, payment) => payment.tokens == spendable_tokens, Budget::Pay(payment) | Budget::After(_, payment) => payment.tokens == spendable_tokens,
Budget::Race(a, b) => a.1.tokens == spendable_tokens && b.1.tokens == spendable_tokens, Budget::Or(a, b) => a.1.tokens == spendable_tokens && b.1.tokens == spendable_tokens,
} }
} }
@ -97,8 +97,8 @@ impl PaymentPlan for Budget {
fn apply_witness(&mut self, witness: &Witness) { fn apply_witness(&mut self, witness: &Witness) {
let new_payment = match self { let new_payment = match self {
Budget::After(cond, payment) if cond.is_satisfied(witness) => Some(payment), Budget::After(cond, payment) if cond.is_satisfied(witness) => Some(payment),
Budget::Race((cond, payment), _) if cond.is_satisfied(witness) => Some(payment), Budget::Or((cond, payment), _) if cond.is_satisfied(witness) => Some(payment),
Budget::Race(_, (cond, payment)) if cond.is_satisfied(witness) => Some(payment), Budget::Or(_, (cond, payment)) if cond.is_satisfied(witness) => Some(payment),
_ => None, _ => None,
}.cloned(); }.cloned();

2
src/transaction.rs
View File

@ -144,7 +144,7 @@ impl Transaction {
last_id: Hash, last_id: Hash,
) -> Self { ) -> Self {
let from = from_keypair.pubkey(); let from = from_keypair.pubkey();
let budget = Budget::Race( let budget = Budget::Or(
(Condition::Timestamp(dt), Payment { tokens, to }), (Condition::Timestamp(dt), Payment { tokens, to }),
(Condition::Signature(from), Payment { tokens, to: from }), (Condition::Signature(from), Payment { tokens, to: from }),
); );