Skip to content

Commit

Permalink
Merge of #9015
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Nov 14, 2024
2 parents ac90773 + 6fb6d5b commit 7b4f178
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion book/src/user/shielded-scan-grpc-server.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ scanner.Scanner.GetResults
scanner.Scanner.RegisterKeys
```

To see the the request and response types for a method, for example the `GetResults` method, try:
To see the request and response types for a method, for example the `GetResults` method, try:


```bash
Expand Down
2 changes: 1 addition & 1 deletion zebra-network/src/meta_addr/tests/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub(crate) fn sanitize_avoids_leaks(original: &MetaAddr, sanitized: &MetaAddr) {

// check the other fields

// Sanitize to the the default state, even though it's not serialized
// Sanitize to the default state, even though it's not serialized
assert_eq!(sanitized.last_connection_state, Default::default());
// Sanitize to known flags
let sanitized_peer_services =
Expand Down
2 changes: 1 addition & 1 deletion zebrad/src/components/mempool/tests/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ async fn mempool_reverifies_after_tip_change() -> Result<(), Report> {
.await;

// Push block 2 to the state. This will increase the tip height past the expected
// tip height that the the tx was verified at.
// tip height that the tx was verified at.
state_service
.ready()
.await
Expand Down
4 changes: 2 additions & 2 deletions zebrad/tests/acceptance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2555,7 +2555,7 @@ async fn submit_block() -> Result<()> {
common::get_block_template_rpcs::submit_block::run().await
}

/// Check that the the end of support code is called at least once.
/// Check that the end of support code is called at least once.
#[test]
fn end_of_support_is_checked_at_start() -> Result<()> {
let _init_guard = zebra_test::init();
Expand Down Expand Up @@ -3474,7 +3474,7 @@ async fn nu6_funding_streams_and_coinbase_balance() -> Result<()> {
"invalid block with excessive coinbase output value should be rejected"
);

// Use an invalid coinbase transaction (with an output value less than than the `block_subsidy + miner_fees - expected_lockbox_funding_stream`)
// Use an invalid coinbase transaction (with an output value less than the `block_subsidy + miner_fees - expected_lockbox_funding_stream`)
let network = base_network_params
.clone()
.with_post_nu6_funding_streams(ConfiguredFundingStreams {
Expand Down
2 changes: 1 addition & 1 deletion zebrad/tests/end_of_support.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fn end_of_support_date() {
));
}

/// Check that the the end of support task is working.
/// Check that the end of support task is working.
#[tokio::test]
#[tracing_test::traced_test]
async fn end_of_support_task() -> Result<()> {
Expand Down

0 comments on commit 7b4f178

Please sign in to comment.