rust 1.89 -> 1.90 (#3616)

* rust 1.89 -> 1.90

fix clippy

- use `is_multiple_of`
- remove some dead code
- update flake.lock, leave that to
  #3601

* nix: remove deprecated apple_sdk

* allow unused_attributes in contract bindings

* nix: fix flake.nix on darwin

Fixes:

    error: linking with `cc` failed: exit status: 1
    ...
    = note: Multiple conflicting values defined for DEVELOPER_DIR_arm64_apple_darwin
            Existing value is /nix/store/rhlyld20zdzdi5wghb4b12gw52s9whr9-apple-sdk-11.3
            Attempting to set to /nix/store/ywb67nwhda4n7lww0dyw394hd7gqw1sr-apple-sdk-12.3 via DEVELOPER_DIR_FOR_TARGET

* Revert "allow unused_attributes in contract bindings"

This reverts commit 6b7182d.

* Reapply "allow unused_attributes in contract bindings"

This reverts commit 9fc4708.

* link foundry issue

Author: sveitser

contracts/rust/adapter/src/lib.rs

@@ -3,7 +3,8 @@
 use alloy::primitives::U256;
 use ark_ff::{BigInteger, PrimeField};
 
-#[allow(dead_code)]
+// See https://github.com/foundry-rs/foundry/issues/11712 regarding unused attributes
+#[allow(dead_code, unused_attributes)]
 pub(crate) mod bindings;
 mod copy;
 pub mod evm;

crates/hotshot/hotshot/src/traits/election/helpers.rs

@@ -121,7 +121,10 @@ impl StableQuorumIterator {
         let (prev_rng, this_rng) = make_rngs(seed, round);
 
         Self {
-            prev_rng: NonRepeatValueIterator::new(prev_rng, calc_num_slots(count, round % 2 == 0)),
+            prev_rng: NonRepeatValueIterator::new(
+                prev_rng,
+                calc_num_slots(count, round.is_multiple_of(2)),
+            ),
             this_rng: NonRepeatValueIterator::new(this_rng, calc_num_slots(count, round % 2 == 1)),
             round,
             count,
@@ -240,7 +243,10 @@ impl RandomOverlapQuorumIterator {
         let this_overlap = this_rng.gen_range(overlap_min..=overlap_max);
 
         Self {
-            prev_rng: NonRepeatValueIterator::new(prev_rng, calc_num_slots(count, round % 2 == 0)),
+            prev_rng: NonRepeatValueIterator::new(
+                prev_rng,
+                calc_num_slots(count, round.is_multiple_of(2)),
+            ),
             this_rng: NonRepeatValueIterator::new(this_rng, calc_num_slots(count, round % 2 == 1)),
             round,
             members: this_members,
@@ -415,7 +421,7 @@ mod tests {
                 "odd set non-overlap value should be odd (stable)"
             );
             assert!(
-                even_set[2] % 2 == 0,
+                even_set[2].is_multiple_of(2),
                 "even set non-overlap value should be even (stable)"
             );
 
@@ -429,7 +435,7 @@ mod tests {
                 "odd set non-overlap value should be odd (random overlap)"
             );
             assert!(
-                even_set[3] % 2 == 0,
+                even_set[3].is_multiple_of(2),
                 "even set non-overlap value should be even (random overlap)"
             );
         }

crates/hotshot/hotshot/src/traits/networking/push_cdn_network.rs

@@ -39,7 +39,6 @@ use hotshot_types::{
     traits::{
         metrics::{Counter, Metrics, NoMetrics},
         network::{BroadcastDelay, ConnectedNetwork, Topic as HotShotTopic},
-        node_implementation::NodeType,
         signature_key::SignatureKey,
     },
     utils::bincode_opts,
@@ -49,11 +48,14 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
 use parking_lot::Mutex;
 #[cfg(feature = "hotshot-testing")]
 use rand::{rngs::StdRng, RngCore, SeedableRng};
-use tokio::{spawn, sync::mpsc::error::TrySendError, time::sleep};
+use tokio::sync::mpsc::error::TrySendError;
+#[cfg(feature = "hotshot-testing")]
+use tokio::{spawn, time::sleep};
 #[cfg(feature = "hotshot-testing")]
 use tracing::error;
 
 use super::NetworkError;
+use crate::NodeType;
 
 /// CDN-specific metrics
 #[derive(Clone)]

crates/hotshot/testing/tests/tests_3/memory_network.rs

@@ -11,16 +11,13 @@ use hotshot::{
     traits::{
         election::static_committee::StaticCommittee,
         implementations::{MasterMap, MemoryNetwork},
-        NodeImplementation,
     },
     types::SignatureKey,
 };
 use hotshot_example_types::{
-    
     block_types::{TestBlockHeader, TestBlockPayload, TestTransaction},
     node_types::TestVersions,
     state_types::{TestInstanceState, TestValidatedState},
-    storage_types::TestStorage,
 };
 use hotshot_types::{
     data::{EpochNumber, ViewNumber},
@@ -32,7 +29,6 @@ use hotshot_types::{
     },
 };
 use rand::{rngs::StdRng, RngCore, SeedableRng};
-use serde::{Deserialize, Serialize};
 use tokio::time::timeout;
 use tracing::{instrument, trace};
 
@@ -65,14 +61,6 @@ impl NodeType for Test {
     type StateSignatureKey = SchnorrPubKey;
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, Hash, PartialEq, Eq)]
-pub struct TestImpl {}
-
-impl NodeImplementation<Test> for TestImpl {
-    type Network = MemoryNetwork<<Test as NodeType>::SignatureKey>;
-    type Storage = TestStorage<Test>;
-}
-
 /// fake Eq
 /// we can't compare the votetokentype for equality, so we can't
 /// derive EQ on `VoteType<TYPES>` and thereby message
@@ -172,7 +160,8 @@ async fn memory_network_direct_queue() {
             .recv_message()
             .await
             .expect("Failed to receive message");
-        let (deserialized_message, _version) = upgrade_lock.deserialize(&recv_message).await.unwrap();
+        let (deserialized_message, _version) =
+            upgrade_lock.deserialize(&recv_message).await.unwrap();
         assert!(timeout(Duration::from_secs(1), network2.recv_message())
             .await
             .is_err());
@@ -193,7 +182,8 @@ async fn memory_network_direct_queue() {
             .recv_message()
             .await
             .expect("Failed to receive message");
-        let (deserialized_message, _version) = upgrade_lock.deserialize(&recv_message).await.unwrap();
+        let (deserialized_message, _version) =
+            upgrade_lock.deserialize(&recv_message).await.unwrap();
         assert!(timeout(Duration::from_secs(1), network1.recv_message())
             .await
             .is_err());
@@ -229,7 +219,8 @@ async fn memory_network_broadcast_queue() {
             .recv_message()
             .await
             .expect("Failed to receive message");
-        let (deserialized_message, _version) = upgrade_lock.deserialize(&recv_message).await.unwrap();
+        let (deserialized_message, _version) =
+            upgrade_lock.deserialize(&recv_message).await.unwrap();
         assert!(timeout(Duration::from_secs(1), network2.recv_message())
             .await
             .is_err());
@@ -254,7 +245,8 @@ async fn memory_network_broadcast_queue() {
             .recv_message()
             .await
             .expect("Failed to receive message");
-        let (deserialized_message, _version) = upgrade_lock.deserialize(&recv_message).await.unwrap();
+        let (deserialized_message, _version) =
+            upgrade_lock.deserialize(&recv_message).await.unwrap();
         assert!(timeout(Duration::from_secs(1), network1.recv_message())
             .await
             .is_err());
@@ -266,7 +258,6 @@ async fn memory_network_broadcast_queue() {
 #[instrument]
 #[allow(deprecated)]
 async fn memory_network_test_in_flight_message_count() {
-
     let group: Arc<MasterMap<<Test as NodeType>::SignatureKey>> = MasterMap::new();
     trace!(?group);
     let pub_key_1 = pubkey();

crates/hotshot/types/src/data/ns_table.rs

@@ -20,7 +20,7 @@ const NS_ID_BYTE_LEN: usize = 4;
 pub fn parse_ns_table(payload_byte_len: usize, bytes: &[u8]) -> Vec<Range<usize>> {
     let mut result = vec![];
     if bytes.len() < NUM_NSS_BYTE_LEN
-        || (bytes.len() - NUM_NSS_BYTE_LEN) % (NS_OFFSET_BYTE_LEN + NS_ID_BYTE_LEN) != 0
+        || !(bytes.len() - NUM_NSS_BYTE_LEN).is_multiple_of(NS_OFFSET_BYTE_LEN + NS_ID_BYTE_LEN)
     {
         tracing::warn!(
             "Failed to parse the metadata as namespace table. Use a single namespace table \

crates/hotshot/types/src/utils.rs

@@ -327,7 +327,7 @@ pub fn epoch_from_block_number(block_number: u64, epoch_height: u64) -> u64 {
         0
     } else if block_number == 0 {
         1
-    } else if block_number % epoch_height == 0 {
+    } else if block_number.is_multiple_of(epoch_height) {
         block_number / epoch_height
     } else {
         block_number / epoch_height + 1
@@ -372,7 +372,7 @@ pub fn option_epoch_from_block_number<TYPES: NodeType>(
             None
         } else if block_number == 0 {
             Some(1u64)
-        } else if block_number % epoch_height == 0 {
+        } else if block_number.is_multiple_of(epoch_height) {
             Some(block_number / epoch_height)
         } else {
             Some(block_number / epoch_height + 1)
@@ -413,7 +413,7 @@ pub fn is_transition_block(block_number: u64, epoch_height: u64) -> bool {
     if block_number == 0 || epoch_height == 0 {
         false
     } else {
-        (block_number + 3) % epoch_height == 0
+        (block_number + 3).is_multiple_of(epoch_height)
     }
 }
 /// returns true if it's the first transition block (epoch height - 2)
@@ -431,7 +431,7 @@ pub fn is_epoch_transition(block_number: u64, epoch_height: u64) -> bool {
     if block_number == 0 || epoch_height == 0 {
         false
     } else {
-        block_number % epoch_height >= epoch_height - 3 || block_number % epoch_height == 0
+        block_number % epoch_height >= epoch_height - 3 || block_number.is_multiple_of(epoch_height)
     }
 }
 
@@ -441,7 +441,7 @@ pub fn is_last_block(block_number: u64, epoch_height: u64) -> bool {
     if block_number == 0 || epoch_height == 0 {
         false
     } else {
-        block_number % epoch_height == 0
+        block_number.is_multiple_of(epoch_height)
     }
 }
 
@@ -467,7 +467,7 @@ pub fn is_epoch_root(block_number: u64, epoch_height: u64) -> bool {
     if block_number == 0 || epoch_height == 0 {
         false
     } else {
-        (block_number + 5) % epoch_height == 0
+        (block_number + 5).is_multiple_of(epoch_height)
     }
 }
 
@@ -477,7 +477,7 @@ pub fn is_ge_epoch_root(block_number: u64, epoch_height: u64) -> bool {
     if block_number == 0 || epoch_height == 0 {
         false
     } else {
-        block_number % epoch_height == 0 || block_number % epoch_height >= epoch_height - 5
+        block_number.is_multiple_of(epoch_height) || block_number % epoch_height >= epoch_height - 5
     }
 }
 
@@ -486,7 +486,7 @@ pub fn is_gt_epoch_root(block_number: u64, epoch_height: u64) -> bool {
     if block_number == 0 || epoch_height == 0 {
         false
     } else {
-        block_number % epoch_height == 0 || block_number % epoch_height > epoch_height - 5
+        block_number.is_multiple_of(epoch_height) || block_number % epoch_height > epoch_height - 5
     }
 }