Merge pull request #5917 from oasisprotocol/peternose/bugfix/rpc-clie…

…nt-panic runtime/src/enclave_rpc/client: Fix panic on drop in async context
oasisprotocol · Oct 22, 2024 · 013c51e · 013c51e
2 parents a950040 + cd0f3be
commit 013c51e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/.changelog/5917.bugfix.md b/.changelog/5917.bugfix.md
@@ -0,0 +1,5 @@
+runtime/src/enclave_rpc/client: Fix panic on drop in async context
+
+The graceful shutdown of active sessions was removed, as they should
+not be closed when the RPC client is dropped. Instead, we should
+explicitly invoke the appropriate functions.
diff --git a/runtime/src/enclave_rpc/client.rs b/runtime/src/enclave_rpc/client.rs
@@ -23,7 +23,6 @@ use crate::{
         time::insecure_posix_time,
     },
     enclave_rpc::{session::Builder, types},
-    future::block_on,
     protocol::Protocol,
 };
 
@@ -623,19 +622,6 @@ impl RpcClient {
     }
 }
 
-impl Drop for RpcClient {
-    fn drop(&mut self) {
-        // Close all sessions after the client is dropped.
-        block_on(async {
-            let sessions = {
-                let mut sessions = self.sessions.lock().await;
-                sessions.drain()
-            };
-            self.close_all(sessions).await;
-        });
-    }
-}
-
 #[cfg(test)]
 mod test {
     use std::sync::{