From f2198c2e9a43fd7803c6c4ad914417e91eee4f9a Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 22 Jun 2018 22:23:52 -0700 Subject: [PATCH] cargo fmt rustc 1.27.0 ``` $ cargo fmt --version rustfmt 0.6.1-stable (49279d71 2018-05-08) ``` --- src/transaction.rs | 3 ++- tests/data_replicator.rs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/transaction.rs b/src/transaction.rs index e9fcf20b89..2a8288c123 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -180,7 +180,8 @@ impl Transaction { /// Verify only the payment plan. pub fn verify_plan(&self) -> bool { if let Instruction::NewContract(contract) = &self.instruction { - self.fee >= 0 && self.fee <= contract.tokens + self.fee >= 0 + && self.fee <= contract.tokens && contract.plan.verify(contract.tokens - self.fee) } else { true diff --git a/tests/data_replicator.rs b/tests/data_replicator.rs index 1e9531a572..b750dbc72e 100644 --- a/tests/data_replicator.rs +++ b/tests/data_replicator.rs @@ -150,7 +150,8 @@ pub fn crdt_retransmit() { trace!("waiting to converge:"); let mut done = false; for _ in 0..30 { - done = c1.read().unwrap().table.len() == 3 && c2.read().unwrap().table.len() == 3 + done = c1.read().unwrap().table.len() == 3 + && c2.read().unwrap().table.len() == 3 && c3.read().unwrap().table.len() == 3; if done { break;