chore(apps/fortuna): update to stable rust

Author: Riateche

.github/workflows/ci-fortuna.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2023-07-23
+          toolchain: 1.82.0
           override: true
       - name: Run executor tests
         run: cargo test --manifest-path ./apps/fortuna/Cargo.toml

.pre-commit-config.yaml

@@ -66,6 +66,12 @@ repos:
         entry: cargo +nightly-2023-07-23 fmt --manifest-path ./apps/fortuna/Cargo.toml --all -- --config-path rustfmt.toml
         pass_filenames: false
         files: apps/fortuna
+      - id: cargo-clippy-fortuna
+        name: Cargo clippy for Fortuna
+        language: "rust"
+        entry: cargo +1.82.0 clippy --manifest-path ./apps/fortuna/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
+        pass_filenames: false
+        files: apps/fortuna
       # Hooks for message buffer contract
       - id: cargo-fmt-message-buffer
         name: Cargo format for message buffer contract

apps/fortuna/Cargo.lock

@@ -1,10 +1,7 @@
-ARG RUST_VERSION=1.66.1
+ARG RUST_VERSION=1.82.0
 
 FROM rust:${RUST_VERSION} AS build
 
-# Set default toolchain
-RUN rustup default nightly-2023-07-23
-
 # Build
 WORKDIR /src
 COPY apps/fortuna apps/fortuna

apps/fortuna/Dockerfile

@@ -1 +1 @@
-nightly-2023-07-23
+1.82.0

apps/fortuna/rust-toolchain

@@ -58,7 +58,7 @@ pub async fn revelation(
     let state = state
         .chains
         .get(&chain_id)
-        .ok_or_else(|| RestError::InvalidChainId)?;
+        .ok_or(RestError::InvalidChainId)?;
 
     let maybe_request_fut = state.contract.get_request(state.provider_address, sequence);
 
@@ -85,7 +85,7 @@ pub async fn revelation(
                 );
                 RestError::Unknown
             })?;
-            let encoded_value = Blob::new(encoding.unwrap_or(BinaryEncoding::Hex), value.clone());
+            let encoded_value = Blob::new(encoding.unwrap_or(BinaryEncoding::Hex), *value);
 
             Ok(Json(GetRandomValueResponse {
                 value: encoded_value,

apps/fortuna/src/api/revelation.rs

@@ -204,10 +204,10 @@ impl<T: JsonRpcClient + 'static + Clone> SignablePythContractInner<T> {
             if let PythRandomEvents::RequestedFilter(r) = PythRandomEvents::decode_log(&l)? {
                 Ok(r.request.sequence_number)
             } else {
-                Err(anyhow!("No log with sequence number").into())
+                Err(anyhow!("No log with sequence number"))
             }
         } else {
-            Err(anyhow!("Request failed").into())
+            Err(anyhow!("Request failed"))
         }
     }
 
@@ -238,10 +238,10 @@ impl<T: JsonRpcClient + 'static + Clone> SignablePythContractInner<T> {
             {
                 Ok(r.random_number)
             } else {
-                Err(anyhow!("No log with randomnumber").into())
+                Err(anyhow!("No log with randomnumber"))
             }
         } else {
-            Err(anyhow!("Request failed").into())
+            Err(anyhow!("Request failed"))
         }
     }
 

apps/fortuna/src/chain/ethereum.rs

@@ -23,9 +23,9 @@ pub enum BlockStatus {
     Safe,
 }
 
-impl Into<EthersBlockNumber> for BlockStatus {
-    fn into(self) -> EthersBlockNumber {
-        match self {
+impl From<BlockStatus> for EthersBlockNumber {
+    fn from(val: BlockStatus) -> Self {
+        match val {
             BlockStatus::Latest => EthersBlockNumber::Latest,
             BlockStatus::Finalized => EthersBlockNumber::Finalized,
             BlockStatus::Safe => EthersBlockNumber::Safe,

apps/fortuna/src/chain/reader.rs

@@ -56,7 +56,7 @@ pub async fn generate(opts: &GenerateOptions) -> Result<()> {
             &provider,
             sequence_number,
             &user_randomness,
-            &provider_randomness,
+            provider_randomness,
         )
         .await?;
 

apps/fortuna/src/command/generate.rs

@@ -56,7 +56,7 @@ pub async fn register_provider_from_config(
 
     // Initialize a Provider to interface with the EVM contract.
     let contract =
-        Arc::new(SignablePythContract::from_config(&chain_config, &private_key_string).await?);
+        Arc::new(SignablePythContract::from_config(chain_config, &private_key_string).await?);
     // Create a new random hash chain.
     let random = rand::random::<[u8; 32]>();
     let secret = provider_config
@@ -68,7 +68,7 @@ pub async fn register_provider_from_config(
     tracing::info!("Generating hash chain");
     let chain = PebbleHashChain::from_config(
         &secret,
-        &chain_id,
+        chain_id,
         &private_key_string.parse::<LocalWallet>()?.address(),
         &chain_config.contract_addr,
         &random,
@@ -86,7 +86,7 @@ pub async fn register_provider_from_config(
         seed:         random,
         chain_length: commitment_length,
     };
-    let uri = get_register_uri(&provider_config.uri, &chain_id)?;
+    let uri = get_register_uri(&provider_config.uri, chain_id)?;
     let call = contract.register(
         fee_in_wei,
         commitment,
@@ -98,7 +98,7 @@ pub async fn register_provider_from_config(
     );
     let mut gas_estimate = call.estimate_gas().await?;
     let gas_multiplier = U256::from(2); //TODO: smarter gas estimation
-    gas_estimate = gas_estimate * gas_multiplier;
+    gas_estimate *= gas_multiplier;
     let call_with_gas = call.gas(gas_estimate);
     if let Some(r) = call_with_gas.send().await?.await? {
         tracing::info!("Registered provider: {:?}", r);