fixup: Get FinderCryptoStore to compile on WASM too

andybalaam · andybalaam · commit 4ad12a0d31c4 · 2024-07-02T10:35:55.000+01:00
diff --git a/crates/matrix-sdk-crypto/src/olm/group_sessions/sender_data_finder.rs b/crates/matrix-sdk-crypto/src/olm/group_sessions/sender_data_finder.rs
@@ -347,7 +347,8 @@ impl<'a, S: FinderCryptoStore> SenderDataFinder<'a, S> {
     }
 }
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub(crate) trait FinderCryptoStore {
     async fn get_device_from_curve_key(
         &self,
@@ -361,7 +362,8 @@ pub(crate) trait FinderCryptoStore {
     ) -> OlmResult<Option<ReadOnlyUserIdentities>>;
 }
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl FinderCryptoStore for Store {
     async fn get_device_from_curve_key(
         &self,
@@ -862,7 +864,8 @@ mod tests {
         }
     }
 
-    #[async_trait]
+    #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+    #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
     impl FinderCryptoStore for FakeCryptoStore {
         async fn get_device_from_curve_key(
             &self,

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,8 @@ impl<'a, S: FinderCryptoStore> SenderDataFinder<'a, S> {`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`
`350`		`-#[async_trait]`
	`350`	`+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]`
	`351`	`+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]`
`351`	`352`	`pub(crate) trait FinderCryptoStore {`
`352`	`353`	`async fn get_device_from_curve_key(`
`353`	`354`	`&self,`
`@@ -361,7 +362,8 @@ pub(crate) trait FinderCryptoStore {`
`361`	`362`	`) -> OlmResult<Option<ReadOnlyUserIdentities>>;`
`362`	`363`	`}`
`363`	`364`
`364`		`-#[async_trait]`
	`365`	`+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]`
	`366`	`+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]`
`365`	`367`	`impl FinderCryptoStore for Store {`
`366`	`368`	`async fn get_device_from_curve_key(`
`367`	`369`	`&self,`
`@@ -862,7 +864,8 @@ mod tests {`
`862`	`864`	`}`
`863`	`865`	`}`
`864`	`866`
`865`		`- #[async_trait]`
	`867`	`+ #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]`
	`868`	`+ #[cfg_attr(not(target_arch = "wasm32"), async_trait)]`
`866`	`869`	`impl FinderCryptoStore for FakeCryptoStore {`
`867`	`870`	`async fn get_device_from_curve_key(`
`868`	`871`	`&self,`