Skip to content

Commit

Permalink
Merge of #6623
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored May 8, 2023
2 parents f6c6311 + e507547 commit 43f03e5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion zebra-consensus/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ where
Self {
network,
state: Timeout::new(state, UTXO_LOOKUP_TIMEOUT),
script_verifier: script::Verifier::default(),
script_verifier: script::Verifier,
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions zebra-network/src/peer_set/unready_service/tests/vectors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ async fn unready_service_result_ok() {
key: Some(MockKey),
cancel,
service: Some(mock_client),
_req: PhantomData::default(),
_req: PhantomData,
};

let result = unready_service.await;
Expand All @@ -50,7 +50,7 @@ async fn unready_service_result_canceled() {
key: Some(MockKey),
cancel,
service: Some(mock_client),
_req: PhantomData::default(),
_req: PhantomData,
};

cancel_sender
Expand All @@ -73,7 +73,7 @@ async fn unready_service_result_cancel_handle_dropped() {
key: Some(MockKey),
cancel,
service: Some(mock_client),
_req: PhantomData::default(),
_req: PhantomData,
};

std::mem::drop(cancel_sender);
Expand Down
2 changes: 1 addition & 1 deletion zebra-state/src/service/check/tests/nullifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ fn transaction_v4_with_joinsplit_data(
joinsplit_data.first.vpub_old = zero_amount;
joinsplit_data.first.vpub_new = zero_amount;

for mut joinsplit in &mut joinsplit_data.rest {
for joinsplit in &mut joinsplit_data.rest {
joinsplit.vpub_old = zero_amount;
joinsplit.vpub_new = zero_amount;
}
Expand Down

0 comments on commit 43f03e5

Please sign in to comment.