chore: Update to specific, supported ruma and sliding-sync-proxy-vers…

…ion.
matrix-org · Jan 31, 2023 · 6af57d9 · 6af57d9
1 parent 1d9275f
commit 6af57d9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,8 +27,8 @@ byteorder = "1.4.3"
 ctor = "0.1.26"
 dashmap = "5.2.0"
 http = "0.2.6"
-ruma = {  git = "https://github.com/ruma/ruma", rev = "3f293073653847d2c56e3c094e0773e3d5b06cc2", features = ["client-api-c"] }
-ruma-common = { git = "https://github.com/ruma/ruma", rev = "3f293073653847d2c56e3c094e0773e3d5b06cc2" }
+ruma = {  git = "https://github.com/ruma/ruma", rev = "00045e559f864eabff08295d603f7b3238288b6f", features = ["client-api-c"] }
+ruma-common = { git = "https://github.com/ruma/ruma", rev = "00045e559f864eabff08295d603f7b3238288b6f" }
 once_cell = "1.16.0"
 serde = "1.0.151"
 serde_html_form = "0.2.0"

diff --git a/bindings/matrix-sdk-ffi/src/sliding_sync.rs b/bindings/matrix-sdk-ffi/src/sliding_sync.rs
@@ -825,7 +825,6 @@ impl SlidingSyncBuilder {
         Arc::new(builder)
     }
 
-
     pub fn with_all_extensions(self: Arc<Self>) -> Arc<Self> {
         let mut builder = unwrap_or_clone_arc(self);
         builder.inner = builder.inner.with_all_extensions();

diff --git a/crates/matrix-sdk/src/sliding_sync.rs b/crates/matrix-sdk/src/sliding_sync.rs
@@ -798,10 +798,7 @@ impl SlidingSync {
 
     /// Add the common extensions if not already configured
     pub fn add_common_extensions(&self) {
-        let mut lock = self
-                .extensions
-                .lock()
-                .unwrap();
+        let mut lock = self.extensions.lock().unwrap();
         let mut cfg = lock.get_or_insert_with(Default::default);
         if cfg.to_device.is_none() {
             cfg.to_device = Some(assign!(ToDeviceConfig::default(), {enabled : Some(true)}));
@@ -812,8 +809,7 @@ impl SlidingSync {
         }
 
         if cfg.account_data.is_none() {
-            cfg.account_data =
-                Some(assign!(AccountDataConfig::default(), {enabled : Some(true)}));
+            cfg.account_data = Some(assign!(AccountDataConfig::default(), {enabled : Some(true)}));
         }
     }
 

diff --git a/testing/sliding-sync-integration-test/assets/docker-compose.yml b/testing/sliding-sync-integration-test/assets/docker-compose.yml
@@ -28,8 +28,8 @@ services:
       - ./data/db:/var/lib/postgresql/data
 
   sliding-sync-proxy:
-    # image: ghcr.io/matrix-org/sliding-sync:0.98.1
-    image: ghcr.io/matrix-org/sliding-sync:latest
+    image: ghcr.io/matrix-org/sliding-sync:v0.99.0-rc1
+    # image: ghcr.io/matrix-org/sliding-sync:latest
     links:
       - synapse
       - postgres