merge queue: embarking main (736f5f5) and [#8611 + #8612] together

book/src/dev/rfcs/0009-zebra-client.md

@@ -189,7 +189,7 @@ A specific set of _privileged_ RPC endpoints:
   via a firewall)
 
 Support for sending tx's via _non-privileged_ RPC endpoints, or via Stolon:
-  - sendTransaction: once you author a transcation you can gossip it via any
+  - sendTransaction: once you author a transaction you can gossip it via any
     Zcash node, not just a specific instance of zebrad
 
 ## Wallet functionality

zebra-chain/src/sapling/keys.rs

@@ -91,7 +91,7 @@ pub(super) fn find_group_hash(d: [u8; 8], m: &[u8]) -> jubjub::ExtendedPoint {
         let gh = jubjub_group_hash(d, &tag[..]);
 
         // We don't want to overflow and start reusing generators
-        assert!(tag[i] != u8::max_value());
+        assert!(tag[i] != u8::MAX);
         tag[i] += 1;
 
         if let Some(gh) = gh {

zebra-chain/src/serialization/tests/preallocate.rs

@@ -77,7 +77,7 @@ fn u8_deser_throws_when_input_too_large() {
 /// Confirm that every u8 takes exactly 1 byte when serialized.
 /// This verifies that our calculated `MAX_U8_ALLOCATION` is indeed an upper bound.
 fn u8_size_is_correct() {
-    for byte in std::u8::MIN..=std::u8::MAX {
+    for byte in u8::MIN..=u8::MAX {
         let serialized = byte
             .zcash_serialize_to_vec()
             .expect("Serialization to vec must succeed");

zebra-chain/src/work/difficulty/arbitrary.rs

@@ -49,7 +49,7 @@ impl Arbitrary for Work {
         // In the Zcash protocol, a Work is converted from an ExpandedDifficulty.
         // But some randomised difficulties are impractically large, and will
         // never appear in any real-world block. So we just use a random Work value.
-        (1..std::u128::MAX).prop_map(Work).boxed()
+        (1..u128::MAX).prop_map(Work).boxed()
     }
 
     type Strategy = BoxedStrategy<Self>;

zebra-grpc/src/tests/snapshot.rs

@@ -1,7 +1,7 @@
 //! Snapshot tests for Zebra Scan gRPC responses.
 //!
 //! Currently we snapshot the `get_info` and `get_results` responses for both mainnet and testnet with a
-//! mocked scanner database. Calls that return `Empty` responses are not snapshoted in this suite.
+//! mocked scanner database. Calls that return `Empty` responses are not snapshotted in this suite.
 //!
 //! To update these snapshots, run:
 //! ```sh
@@ -26,7 +26,7 @@
 };
 
 /// The extended Sapling viewing key of [ZECpages](https://zecpages.com/boardinfo)
 pub const ZECPAGES_SAPLING_VIEWING_KEY: &str = "zxviews1q0duytgcqqqqpqre26wkl45gvwwwd706xw608hucmvfalr759ejwf7qshjf5r9aa7323zulvz6plhttp5mltqcgs9t039cx2d09mgq05ts63n8u35hyv6h9nc9ctqqtue2u7cer2mqegunuulq2luhq3ywjcz35yyljewa4mgkgjzyfwh6fr6jd0dzd44ghk0nxdv2hnv4j5nxfwv24rwdmgllhe0p8568sgqt9ckt02v2kxf5ahtql6s0ltjpkckw8gtymxtxuu9gcr0swvz";
 
 #[tokio::test(flavor = "multi_thread")]
 #[cfg(not(target_os = "windows"))]
@@ -45,7 +45,7 @@
     );
 }
 
 async fn test_mocked_rpc_response_data_for_network(network: Network, random_port: u16) {
     // get a mocked scan service
     let mock_scan_service = MockService::build().for_unit_tests();
 
@@ -223,12 +223,12 @@
 }
 
 /// Snapshot `getinfo` response, using `cargo insta` and JSON serialization.
 fn snapshot_rpc_getinfo(info: InfoReply, settings: &insta::Settings) {
     settings.bind(|| insta::assert_json_snapshot!("get_info", info));
 }
 
 /// Snapshot `getresults` response, using `cargo insta` and JSON serialization.
 fn snapshot_rpc_getresults(results: GetResultsResponse, settings: &insta::Settings) {
     settings.bind(|| insta::assert_json_snapshot!("get_results", results));
 }