Update clippy in test & fix warnings

AcalaNetwork · May 10, 2024 · 3281f89 · 3281f89
1 parent f297306
commit 3281f89
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,15 +22,15 @@ jobs:
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: nightly-2023-09-29
+          toolchain: nightly-2024-02-09
           components: rustfmt, clippy
       - uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Check format
-        run: cargo +nightly-2023-09-29 fmt --all -- --check
+        run: cargo +nightly-2024-02-09 fmt --all -- --check
       - name: Check clippy
-        run: cargo +nightly-2023-09-29 clippy --all-targets --all-features -- -D warnings
+        run: cargo +nightly-2024-02-09 clippy --all-targets --all-features -- -D warnings
       - name: Build
         run: cargo build --verbose
       - name: Run tests

diff --git a/src/extensions/client/endpoint.rs b/src/extensions/client/endpoint.rs
@@ -134,7 +134,7 @@ impl Endpoint {
         params: Vec<serde_json::Value>,
         timeout: Duration,
     ) -> Result<serde_json::Value, jsonrpsee::core::client::Error> {
-        match tokio::time::timeout(timeout, async {
+        let request_result = tokio::time::timeout(timeout, async {
             self.connected().await;
             let client = self
                 .client_rx
@@ -149,8 +149,9 @@ impl Endpoint {
                 }
             }
         })
-        .await
-        {
+        .await;
+
+        match request_result {
             Ok(res) => res,
             Err(_) => {
                 tracing::error!("request timed out method: {method} params: {params:?}");
@@ -167,7 +168,7 @@ impl Endpoint {
         unsubscribe_method: &str,
         timeout: Duration,
     ) -> Result<Subscription<serde_json::Value>, jsonrpsee::core::client::Error> {
-        match tokio::time::timeout(timeout, async {
+        let subscription_result = tokio::time::timeout(timeout, async {
             self.connected().await;
             let client = self
                 .client_rx
@@ -185,8 +186,9 @@ impl Endpoint {
                 }
             }
         })
-        .await
-        {
+        .await;
+
+        match subscription_result {
             Ok(res) => res,
             Err(_) => {
                 tracing::error!("subscribe timed out subscribe: {subscribe_method} params: {params:?}");