From 39fefa52bb7146a82a17201184faf5af9bd2f1bb Mon Sep 17 00:00:00 2001 From: teor Date: Tue, 21 Jun 2022 16:03:17 +1000 Subject: [PATCH] cargo fmt --all --- zebra-chain/src/transaction/tests/vectors.rs | 14 ++++++-------- zebrad/tests/acceptance.rs | 6 ++++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/zebra-chain/src/transaction/tests/vectors.rs b/zebra-chain/src/transaction/tests/vectors.rs index 8f9377012a7..70fb69e6b6f 100644 --- a/zebra-chain/src/transaction/tests/vectors.rs +++ b/zebra-chain/src/transaction/tests/vectors.rs @@ -838,15 +838,14 @@ fn zip143_sighash() -> Result<()> { Some(output) => mock_pre_v5_output_list(output, input_index.unwrap()), None => vec![], }; - let result = hex::encode( - transaction.sighash( + let result = + hex::encode(transaction.sighash( NetworkUpgrade::from_branch_id(test.consensus_branch_id) .expect("must be a valid branch ID"), HashType::from_bits(test.hash_type).expect("must be a valid HashType"), &all_previous_outputs, input_index, - ), - ); + )); let expected = hex::encode(test.sighash); assert_eq!(expected, result, "test #{}: sighash does not match", i); } @@ -874,15 +873,14 @@ fn zip243_sighash() -> Result<()> { Some(output) => mock_pre_v5_output_list(output, input_index.unwrap()), None => vec![], }; - let result = hex::encode( - transaction.sighash( + let result = + hex::encode(transaction.sighash( NetworkUpgrade::from_branch_id(test.consensus_branch_id) .expect("must be a valid branch ID"), HashType::from_bits(test.hash_type).expect("must be a valid HashType"), &all_previous_outputs, input_index, - ), - ); + )); let expected = hex::encode(test.sighash); assert_eq!(expected, result, "test #{}: sighash does not match", i); } diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs index 719418a7ba4..0156452057e 100644 --- a/zebrad/tests/acceptance.rs +++ b/zebrad/tests/acceptance.rs @@ -1300,7 +1300,8 @@ fn lightwalletd_integration_test(test_type: LightwalletdTestType) -> Result<()> // lightwalletd will keep retrying getblock. if !test_type.allow_lightwalletd_cached_state() { if test_type.needs_zebra_cached_state() { - lightwalletd.expect_stdout_line_matches("([Aa]dding block to cache)|([Ww]aiting for block)")?; + lightwalletd + .expect_stdout_line_matches("([Aa]dding block to cache)|([Ww]aiting for block)")?; } else { lightwalletd.expect_stdout_line_matches(regex::escape( "Waiting for zcashd height to reach Sapling activation height (419200)", @@ -1313,7 +1314,8 @@ fn lightwalletd_integration_test(test_type: LightwalletdTestType) -> Result<()> zebrad.expect_stdout_line_matches(SYNC_FINISHED_REGEX)?; // Wait for lightwalletd to sync some blocks - lightwalletd.expect_stdout_line_matches("([Aa]dding block to cache)|([Ww]aiting for block)")?; + lightwalletd + .expect_stdout_line_matches("([Aa]dding block to cache)|([Ww]aiting for block)")?; // Wait for lightwalletd to sync to Zebra's tip //