From 62eeb3707f3c75f3df4f9325e75661f0aee3cd38 Mon Sep 17 00:00:00 2001
From: Devin R <devin.ragotzy@gmail.com>
Date: Sat, 4 Jul 2020 19:34:45 -0400
Subject: [PATCH] Fix wasm test failure gate unknown import

---
 matrix_sdk_base/Cargo.toml         | 1 -
 matrix_sdk_base/src/client.rs      | 5 ++++-
 matrix_sdk_base/src/models/room.rs | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/matrix_sdk_base/Cargo.toml b/matrix_sdk_base/Cargo.toml
index 20958300..e78749b3 100644
--- a/matrix_sdk_base/Cargo.toml
+++ b/matrix_sdk_base/Cargo.toml
@@ -40,7 +40,6 @@ http = "0.2.1"
 tracing-subscriber = "0.2.7"
 tempfile = "3.1.0"
 mockito = "0.25.1"
-url = "2.1.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 tokio = { version = "0.2.21", features = ["rt-threaded", "macros"] }
diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs
index 23310c89..c37ca77b 100644
--- a/matrix_sdk_base/src/client.rs
+++ b/matrix_sdk_base/src/client.rs
@@ -1839,7 +1839,7 @@ impl BaseClient {
 #[cfg(test)]
 mod test {
     use crate::identifiers::{RoomId, UserId};
-    use crate::{BaseClient, BaseClientConfig, JsonStore, Session};
+    use crate::{BaseClient, BaseClientConfig, Session};
     use matrix_sdk_common::events::{AnyRoomEventStub, EventJson};
     use matrix_sdk_common_macros::async_trait;
     use matrix_sdk_test::{async_test, test_json, EventBuilder, EventsJson};
@@ -1847,6 +1847,9 @@ mod test {
     use std::convert::TryFrom;
     use tempfile::tempdir;
 
+    #[cfg(feature = "messages")]
+    use crate::JsonStore;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::*;
 
diff --git a/matrix_sdk_base/src/models/room.rs b/matrix_sdk_base/src/models/room.rs
index 41fefce0..0012dff2 100644
--- a/matrix_sdk_base/src/models/room.rs
+++ b/matrix_sdk_base/src/models/room.rs
@@ -34,14 +34,14 @@ use crate::events::room::{
 };
 
 use crate::events::{
-    Algorithm, AnyMessageEventContent, AnyRoomEventStub, AnyStateEventStub,
-    AnyStrippedStateEventStub, EventJson, EventType, StateEventStub, StrippedStateEventStub,
+    Algorithm, AnyRoomEventStub, AnyStateEventStub, AnyStrippedStateEventStub, EventType,
+    StateEventStub, StrippedStateEventStub,
 };
 
 #[cfg(feature = "messages")]
 use crate::events::{
     room::redaction::{RedactionEvent, RedactionEventStub},
-    AnyMessageEventStub,
+    AnyMessageEventContent, AnyMessageEventStub, EventJson,
 };
 
 use crate::identifiers::{RoomAliasId, RoomId, UserId};