diff --git a/book/src/dev/continuous-delivery.md b/book/src/dev/continuous-delivery.md index 30c3ed7e86b..c977de01fc3 100644 --- a/book/src/dev/continuous-delivery.md +++ b/book/src/dev/continuous-delivery.md @@ -1,6 +1,6 @@ # Zebra Continuous Delivery -Zebra has an extension of it's continuous integration since it automatically deploys all +Zebra has an extension of its continuous integration since it automatically deploys all code changes to a testing and/or pre-production environment after each PR gets merged into the `main` branch, and on each Zebra `release`. diff --git a/book/src/dev/rfcs/drafts/0005-treestate.md b/book/src/dev/rfcs/drafts/0005-treestate.md index f8c83936da7..67ad62262e8 100644 --- a/book/src/dev/rfcs/drafts/0005-treestate.md +++ b/book/src/dev/rfcs/drafts/0005-treestate.md @@ -96,7 +96,7 @@ parsed and the notes for each tree collected in their appropriate positions, the root of each tree is computed. While the trees are being built, the respective block nullifier sets are updated in memory as note nullifiers are revealed. If the rest of the block is validated according to consensus rules, that root is -committed to its own datastructure via our state service (Sprout anchors, +committed to its own data structure via our state service (Sprout anchors, Sapling anchors). Sapling block validation includes comparing the specified FinalSaplingRoot in its block header to the root of the Sapling `NoteCommitment` tree that we have just computed to make sure they match. diff --git a/book/src/dev/rfcs/drafts/xxxx-block-subsidy.md b/book/src/dev/rfcs/drafts/xxxx-block-subsidy.md index 2ab752c4be6..838343ee77d 100644 --- a/book/src/dev/rfcs/drafts/xxxx-block-subsidy.md +++ b/book/src/dev/rfcs/drafts/xxxx-block-subsidy.md @@ -70,7 +70,7 @@ In Zebra the consensus related code lives in the `zebra-consensus` crate. The bl Inside `zebra-consensus/src/block/subsidy/` the following submodules will be created: - `general.rs`: General block reward functions and utilities. -- `founders_reward.rs`: Specific functions related to funders reward. +- `founders_reward.rs`: Specific functions related to founders reward. - `funding_streams.rs`: Specific functions for funding streams. In addition to calculations the block subsidy requires constants defined in the protocol. The implementation will also create additional constants, all of them will live at: diff --git a/book/src/user/docker.md b/book/src/user/docker.md index dbaf726cf9a..d77c234b537 100644 --- a/book/src/user/docker.md +++ b/book/src/user/docker.md @@ -177,6 +177,6 @@ Specific tests are defined in `docker/test.env` file and can be enabled by setti ## Registries -The images built by the Zebra team are all publicly hosted. Old image versions meant to be used by our [CI pipeline](https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/ci-integration-tests-gcp.yml) (`zebrad-test`, `lighwalletd`) might be deleted on a scheduled basis. +The images built by the Zebra team are all publicly hosted. Old image versions meant to be used by our [CI pipeline](https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/ci-integration-tests-gcp.yml) (`zebrad-test`, `lightwalletd`) might be deleted on a scheduled basis. We use [Docker Hub](https://hub.docker.com/r/zfnd/zebra) for end-user images and [Google Artifact Registry](https://console.cloud.google.com/artifacts/docker/zfnd-dev-zebra/us/zebra) to build external tools and test images. diff --git a/book/src/user/shielded-scan-grpc-server.md b/book/src/user/shielded-scan-grpc-server.md index d08bc0df49e..327ec14f861 100644 --- a/book/src/user/shielded-scan-grpc-server.md +++ b/book/src/user/shielded-scan-grpc-server.md @@ -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 diff --git a/book/src/user/shielded-scan.md b/book/src/user/shielded-scan.md index dff3e599ed8..7358b65d782 100644 --- a/book/src/user/shielded-scan.md +++ b/book/src/user/shielded-scan.md @@ -100,4 +100,4 @@ ldb --db="$HOME/.cache/zebra/private-scan/v1/mainnet" --secondary_path= --column Some of the output will be markers the scanner uses to keep track of progress, however, some of them will be transactions found. -To lean more about how to filter the database please refer to [RocksDB Administration and Data Access Tool](https://github.com/facebook/rocksdb/wiki/Administration-and-Data-Access-Tool) +To learn more about how to filter the database please refer to [RocksDB Administration and Data Access Tool](https://github.com/facebook/rocksdb/wiki/Administration-and-Data-Access-Tool) diff --git a/zebra-network/src/meta_addr/tests/check.rs b/zebra-network/src/meta_addr/tests/check.rs index 234a2352567..f24c4a71fc5 100644 --- a/zebra-network/src/meta_addr/tests/check.rs +++ b/zebra-network/src/meta_addr/tests/check.rs @@ -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 = diff --git a/zebrad/src/components/mempool/tests/vector.rs b/zebrad/src/components/mempool/tests/vector.rs index c285923fa7d..86848c8bae7 100644 --- a/zebrad/src/components/mempool/tests/vector.rs +++ b/zebrad/src/components/mempool/tests/vector.rs @@ -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 diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs index cd3572ce3f2..b0949cd336d 100644 --- a/zebrad/tests/acceptance.rs +++ b/zebrad/tests/acceptance.rs @@ -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(); @@ -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 { diff --git a/zebrad/tests/end_of_support.rs b/zebrad/tests/end_of_support.rs index 94c4d3cc967..9b28d63ee91 100644 --- a/zebrad/tests/end_of_support.rs +++ b/zebrad/tests/end_of_support.rs @@ -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<()> {