Skip to content

Commit

Permalink
cargo fmt --all
Browse files Browse the repository at this point in the history
  • Loading branch information
teor2345 committed Jun 22, 2022
1 parent 1e74eaf commit 39fefa5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
14 changes: 6 additions & 8 deletions zebra-chain/src/transaction/tests/vectors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
6 changes: 4 additions & 2 deletions zebrad/tests/acceptance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand All @@ -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
//
Expand Down

0 comments on commit 39fefa5

Please sign in to comment.