Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into auth-rpc-endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
oxarbitrage committed Oct 21, 2024
2 parents 43131b8 + 01fa12b commit f685e74
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .codespellrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[codespell]
ignore-words-list=crate,Sur,inout,Groth,groth,re-use,
exclude-file=book/mermaid.min.js
ignore-words-list = crate,Sur,inout,Groth,groth,re-use,
exclude-file = book/mermaid.min.js
skip = ./zebra-rpc/qa/rpc-tests,./supply-chain
5 changes: 2 additions & 3 deletions zebra-chain/src/transaction/serialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -622,9 +622,8 @@ impl ZcashSerialize for Transaction {
}

// Denoted as `bindingSigSapling` in the spec.
match sapling_shielded_data {
Some(sd) => writer.write_all(&<[u8; 64]>::from(sd.binding_sig)[..])?,
None => {}
if let Some(shielded_data) = sapling_shielded_data {
writer.write_all(&<[u8; 64]>::from(shielded_data.binding_sig)[..])?;
}
}

Expand Down
2 changes: 1 addition & 1 deletion zebra-test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ struct SkipTestReturnedErrPanicMessages;
impl PanicMessage for SkipTestReturnedErrPanicMessages {
fn display(
&self,
pi: &std::panic::PanicInfo<'_>,
pi: &std::panic::PanicHookInfo<'_>,
f: &mut std::fmt::Formatter<'_>,
) -> std::fmt::Result {
let payload = pi
Expand Down

0 comments on commit f685e74

Please sign in to comment.