Merge pull request #1030 from openmina/chore/rust184

chore: Update minimum Rust toolchain to 1.84

Author: tizoc

.drone.yml

@@ -53,10 +53,10 @@ steps:
       - cp /usr/local/bin/mina cli/bin/
 
   - name: build
-    image: rust:1.83-bullseye
+    image: rust:1.84-bullseye
     commands:
       - apt-get update && apt-get install -y libssl-dev libjemalloc-dev jq protobuf-compiler
-      - rustup update 1.83 && rustup default 1.83
+      - rustup update 1.84 && rustup default 1.84
       - rustup component add rustfmt
       # just to be sure it builds without errors
       - cargo build

.github/workflows/ci.yaml

@@ -131,7 +131,7 @@ jobs:
 
       - name: Setup Rust
         run: |
-          rustup default 1.83
+          rustup default 1.84
           rustup component add rustfmt
 
       - name: Setup Rust Cache
@@ -157,7 +157,7 @@ jobs:
 
       - name: Setup Rust
         run: |
-          rustup default 1.83
+          rustup default 1.84
           rustup component add rustfmt
 
       - name: Setup Rust Cache
@@ -217,7 +217,7 @@ jobs:
 
       - name: Setup Rust
         run: |
-          rustup default 1.83
+          rustup default 1.84
           rustup component add rustfmt
 
       - name: Setup Rust Cache
@@ -253,7 +253,7 @@ jobs:
 
       - name: Setup Rust
         run: |
-          rustup default 1.83
+          rustup default 1.84
           rustup component add rustfmt
 
       - name: Setup Rust Cache

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ jobs:
           sudo apt install -y protobuf-compiler
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.83
+          toolchain: 1.84
           components: rustfmt, clippy
           default: true
       - uses: actions-rs/cargo@v1
@@ -36,4 +36,4 @@ jobs:
         name: clippy
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-targets -- -D warnings --allow clippy::mutable_key_type --allow clippy::result_unit_err
+          args: --all-targets -- -D warnings --allow clippy::mutable_key_type

Dockerfile

@@ -1,6 +1,6 @@
 FROM rust:buster AS build
 RUN apt-get update && apt-get install -y protobuf-compiler && apt-get clean
-RUN rustup default 1.83 && rustup component add rustfmt
+RUN rustup default 1.84 && rustup component add rustfmt
 WORKDIR /openmina
 COPY . .
 RUN cargo build --release --package=cli --bin=openmina

cli/tests/bootstrap.rs

@@ -117,12 +117,12 @@ const READY: Duration = Duration::from_secs(20 * 60);
 
 fn is_healthy() -> bool {
     reqwest::blocking::get(format!("http://localhost:{HTTP_PORT}/healthz"))
-        .map_or(false, |res| res.status().is_success())
+        .is_ok_and(|res| res.status().is_success())
 }
 
 fn is_ready() -> bool {
     let ready = reqwest::blocking::get(format!("http://localhost:{HTTP_PORT}/readyz"))
-        .map_or(false, |res| res.status().is_success());
+        .is_ok_and(|res| res.status().is_success());
 
     if let Err(err) = sync_stats() {
         println!("error getting stats: {err}");

core/src/block/block_with_hash.rs

@@ -118,7 +118,7 @@ impl<T: AsRef<Block>> BlockWithHash<T> {
             || constraint_constants()
                 .fork
                 .as_ref()
-                .map_or(false, |fork| fork.blockchain_length + 1 == self.height())
+                .is_some_and(|fork| fork.blockchain_length + 1 == self.height())
     }
 
     pub fn root_block_height(&self) -> u32 {

core/src/distributed_pool.rs

@@ -37,7 +37,7 @@ where
     pub fn contains(&self, key: &Key) -> bool {
         self.by_key
             .get(key)
-            .map_or(false, |i| self.list.contains_key(i))
+            .is_some_and(|i| self.list.contains_key(i))
     }
 
     pub fn get(&self, key: &Key) -> Option<&State> {

docker/producer-dashboard/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.83 AS app-builder
+FROM rust:1.84 AS app-builder
 
 WORKDIR /usr/src/openmina-producer-dashboard
 

docs/building-from-source-guide.md

@@ -39,8 +39,8 @@ Open up the command line and enter the following:
 And then:
 
 ```sh
-# Install rustup and set the default Rust toolchain to 1.80 (newer versions work too)
-curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.80
+# Install rustup and set the default Rust toolchain to 1.84 (newer versions work too)
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.84
 # Setup the current shell with rustup
 source "$HOME/.cargo/env"
 # Clone the openmina repository

ledger/src/transaction_pool.rs

@@ -1257,6 +1257,7 @@ impl IndexedPool {
         };
 
         // TODO: Should `self.all_by_fee` be a `BTreeSet` instead ?
+        #[allow(clippy::mutable_key_type)]
         let bset: BTreeSet<_> = set.iter().collect();
         // TODO: Not sure if OCaml compare the same way than we do
         let min = bset.first().map(|min| (*min).clone()).unwrap();
@@ -1755,9 +1756,12 @@ impl TransactionPool {
             let mut new_commands = collect_hashed(new_commands);
             let mut removed_commands = collect_hashed(removed_commands);
 
+            #[allow(clippy::mutable_key_type)]
             let new_commands_set = new_commands.iter().collect::<HashSet<_>>();
+            #[allow(clippy::mutable_key_type)]
             let removed_commands_set = removed_commands.iter().collect::<HashSet<_>>();
 
+            #[allow(clippy::mutable_key_type)]
             let duplicates = new_commands_set
                 .intersection(&removed_commands_set)
                 .map(|cmd| (*cmd).clone())