fix: guard websocket callbacks against drop

Author: sanity

rust/src/contract_interface/encoding.rs

@@ -1,10 +1,13 @@
 //! Helper types for interaction between wasm and host boundaries.
-use std::{collections::{HashMap, HashSet}, marker::PhantomData};
+use std::{
+    collections::{HashMap, HashSet},
+    marker::PhantomData,
+};
 
 use serde::{de::DeserializeOwned, Serialize};
 
-use crate::parameters::Parameters;
 use super::*;
+use crate::parameters::Parameters;
 
 pub enum MergeResult {
     Success,
@@ -78,8 +81,7 @@ impl RelatedContractsContainer {
     pub fn get<C: TypedContract>(
         &self,
         params: &C::Parameters,
-    ) -> Result<Related<C>, <<C as EncodingAdapter>::SelfEncoder as Encoder<C>>::Error>
-    {
+    ) -> Result<Related<C>, <<C as EncodingAdapter>::SelfEncoder as Encoder<C>>::Error> {
         let id = <C as TypedContract>::instance_id(params);
         if let Some(res) = self.contracts.get(&id) {
             match <<C as EncodingAdapter>::SelfEncoder>::deserialize(res.as_ref()) {
@@ -335,12 +337,9 @@ where
             <T as EncodingAdapter>::Parameters,
         >>::Error,
     >,
-    ContractError:
-        From<
-            <<T as EncodingAdapter>::SummaryEncoder as Encoder<
-                <T as EncodingAdapter>::Summary,
-            >>::Error,
-        >,
+    ContractError: From<
+        <<T as EncodingAdapter>::SummaryEncoder as Encoder<<T as EncodingAdapter>::Summary>>::Error,
+    >,
 {
     let typed_params =
         <<T as EncodingAdapter>::ParametersEncoder>::deserialize(parameters.as_ref())?;
@@ -363,21 +362,17 @@ where
             <T as EncodingAdapter>::Parameters,
         >>::Error,
     >,
-    ContractError:
-        From<
-            <<T as EncodingAdapter>::SummaryEncoder as Encoder<
-                <T as EncodingAdapter>::Summary,
-            >>::Error,
-        >,
+    ContractError: From<
+        <<T as EncodingAdapter>::SummaryEncoder as Encoder<<T as EncodingAdapter>::Summary>>::Error,
+    >,
     ContractError: From<
         <<T as EncodingAdapter>::DeltaEncoder as Encoder<<T as EncodingAdapter>::Delta>>::Error,
     >,
 {
     let typed_params =
         <<T as EncodingAdapter>::ParametersEncoder>::deserialize(parameters.as_ref())?;
     let typed_state = <<T as EncodingAdapter>::SelfEncoder>::deserialize(state.as_ref())?;
-    let typed_summary =
-        <<T as EncodingAdapter>::SummaryEncoder>::deserialize(summary.as_ref())?;
+    let typed_summary = <<T as EncodingAdapter>::SummaryEncoder>::deserialize(summary.as_ref())?;
     let summary = typed_state.delta(typed_params, typed_summary)?;
     let encoded = <<T as EncodingAdapter>::DeltaEncoder>::serialize(&summary)?;
     Ok(encoded.into())

rust/src/contract_interface/mod.rs

@@ -6,28 +6,28 @@
 
 pub(crate) const CONTRACT_KEY_SIZE: usize = 32;
 
-mod error;
-mod state;
-mod key;
 mod code;
-mod update;
 mod contract;
-mod wrapped;
+pub mod encoding;
+mod error;
+mod key;
+mod state;
 mod trait_def;
+mod update;
 pub(crate) mod wasm_interface;
-pub mod encoding;
+mod wrapped;
 
 #[cfg(all(test, any(unix, windows)))]
 mod tests;
 
 // Re-export all public types
+pub use code::ContractCode;
+pub use contract::Contract;
 pub use error::ContractError;
-pub use state::{State, StateDelta, StateSummary};
 pub use key::{ContractInstanceId, ContractKey};
-pub use code::ContractCode;
+pub use state::{State, StateDelta, StateSummary};
+pub use trait_def::ContractInterface;
 pub use update::{
-    UpdateData, UpdateModification, RelatedContracts, RelatedContract, RelatedMode, ValidateResult,
+    RelatedContract, RelatedContracts, RelatedMode, UpdateData, UpdateModification, ValidateResult,
 };
-pub use contract::Contract;
-pub use wrapped::{WrappedState, WrappedContract};
-pub use trait_def::ContractInterface;
+pub use wrapped::{WrappedContract, WrappedState};