From 13d474f6ee210e6e747ad5ec29d871eb1c8b462f Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Tue, 16 Jun 2020 12:19:58 +0200
Subject: [PATCH] fix: update ruma version

---
 Cargo.lock            | 20 ++++++++++----------
 Cargo.toml            |  7 ++++---
 src/database/rooms.rs |  2 +-
 src/pdu.rs            |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fe80fb6..ae62715 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1263,7 +1263,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.1.0"
-source = "git+https://github.com/ruma/ruma?rev=12388c3fbc8ba2a685cbf0fe810c633c827f5b2c#12388c3fbc8ba2a685cbf0fe810c633c827f5b2c"
+source = "git+https://github.com/ruma/ruma?rev=baa87104569b45dc07a9a7a16d3c7592ab8f4d6b#baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 dependencies = [
  "ruma-api",
  "ruma-client-api",
@@ -1277,7 +1277,7 @@ dependencies = [
 [[package]]
 name = "ruma-api"
 version = "0.16.1"
-source = "git+https://github.com/ruma/ruma?rev=12388c3fbc8ba2a685cbf0fe810c633c827f5b2c#12388c3fbc8ba2a685cbf0fe810c633c827f5b2c"
+source = "git+https://github.com/ruma/ruma?rev=baa87104569b45dc07a9a7a16d3c7592ab8f4d6b#baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 dependencies = [
  "http",
  "percent-encoding 2.1.0",
@@ -1292,7 +1292,7 @@ dependencies = [
 [[package]]
 name = "ruma-api-macros"
 version = "0.16.1"
-source = "git+https://github.com/ruma/ruma?rev=12388c3fbc8ba2a685cbf0fe810c633c827f5b2c#12388c3fbc8ba2a685cbf0fe810c633c827f5b2c"
+source = "git+https://github.com/ruma/ruma?rev=baa87104569b45dc07a9a7a16d3c7592ab8f4d6b#baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.6",
@@ -1302,7 +1302,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.9.0"
-source = "git+https://github.com/ruma/ruma?rev=12388c3fbc8ba2a685cbf0fe810c633c827f5b2c#12388c3fbc8ba2a685cbf0fe810c633c827f5b2c"
+source = "git+https://github.com/ruma/ruma?rev=baa87104569b45dc07a9a7a16d3c7592ab8f4d6b#baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 dependencies = [
  "http",
  "js_int",
@@ -1319,7 +1319,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.1.3"
-source = "git+https://github.com/ruma/ruma?rev=12388c3fbc8ba2a685cbf0fe810c633c827f5b2c#12388c3fbc8ba2a685cbf0fe810c633c827f5b2c"
+source = "git+https://github.com/ruma/ruma?rev=baa87104569b45dc07a9a7a16d3c7592ab8f4d6b#baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 dependencies = [
  "matches",
  "ruma-serde",
@@ -1356,7 +1356,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.0.2"
-source = "git+https://github.com/ruma/ruma?rev=12388c3fbc8ba2a685cbf0fe810c633c827f5b2c#12388c3fbc8ba2a685cbf0fe810c633c827f5b2c"
+source = "git+https://github.com/ruma/ruma?rev=baa87104569b45dc07a9a7a16d3c7592ab8f4d6b#baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 dependencies = [
  "js_int",
  "matches",
@@ -1371,17 +1371,17 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers"
 version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6316cb248e3e0323a5a269b8eaed571404fb4f65c81848549e9ba99fd9b8e9de"
+source = "git+https://github.com/ruma/ruma?rev=baa87104569b45dc07a9a7a16d3c7592ab8f4d6b#baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 dependencies = [
  "rand",
  "serde",
+ "strum",
 ]
 
 [[package]]
 name = "ruma-serde"
 version = "0.2.2"
-source = "git+https://github.com/ruma/ruma?rev=12388c3fbc8ba2a685cbf0fe810c633c827f5b2c#12388c3fbc8ba2a685cbf0fe810c633c827f5b2c"
+source = "git+https://github.com/ruma/ruma?rev=baa87104569b45dc07a9a7a16d3c7592ab8f4d6b#baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 dependencies = [
  "dtoa",
  "itoa",
@@ -1394,7 +1394,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.6.0-dev.1"
-source = "git+https://github.com/ruma/ruma?rev=12388c3fbc8ba2a685cbf0fe810c633c827f5b2c#12388c3fbc8ba2a685cbf0fe810c633c827f5b2c"
+source = "git+https://github.com/ruma/ruma?rev=baa87104569b45dc07a9a7a16d3c7592ab8f4d6b#baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 dependencies = [
  "base64 0.12.1",
  "ring",
diff --git a/Cargo.toml b/Cargo.toml
index 38c7530..cc8c595 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,13 +30,14 @@ image = { version = "0.23.4", default-features = false, features = ["jpeg", "png
 
 [dependencies.ruma]
 git = "https://github.com/ruma/ruma"
-rev = "12388c3fbc8ba2a685cbf0fe810c633c827f5b2c"
+rev = "baa87104569b45dc07a9a7a16d3c7592ab8f4d6b"
 #path = "../ruma/ruma"
 features = ["rand", "client-api", "federation-api"]
 
 # These are required only until ruma-events and ruma-federation-api are merged into ruma/ruma
 [patch.crates-io]
-ruma-common = { git = "https://github.com/ruma/ruma", rev = "12388c3fbc8ba2a685cbf0fe810c633c827f5b2c" }
-ruma-serde = { git = "https://github.com/ruma/ruma", rev = "12388c3fbc8ba2a685cbf0fe810c633c827f5b2c" }
+ruma-common = { git = "https://github.com/ruma/ruma", rev = "baa87104569b45dc07a9a7a16d3c7592ab8f4d6b" }
+ruma-serde = { git = "https://github.com/ruma/ruma", rev = "baa87104569b45dc07a9a7a16d3c7592ab8f4d6b" }
+ruma-identifiers = { git = "https://github.com/ruma/ruma", rev = "baa87104569b45dc07a9a7a16d3c7592ab8f4d6b" }
 #ruma-common = { path = "../ruma/ruma-common" }
 #ruma-serde = { path = "../ruma/ruma-serde" }
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 6b3b9c5..ee14fc8 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -474,7 +474,7 @@ impl Rooms {
             auth_events: Vec::new(),
             redacts: redacts.clone(),
             unsigned,
-            hashes: ruma::api::federation::pdu::EventHash {
+            hashes: ruma::api::federation::EventHash {
                 sha256: "aaa".to_owned(),
             },
             signatures: HashMap::new(),
diff --git a/src/pdu.rs b/src/pdu.rs
index 5cb5fb1..f496933 100644
--- a/src/pdu.rs
+++ b/src/pdu.rs
@@ -1,7 +1,7 @@
 use crate::{Error, Result};
 use js_int::UInt;
 use ruma::{
-    api::federation::pdu::EventHash,
+    api::federation::EventHash,
     events::{
         collections::all::{RoomEvent, StateEvent},
         stripped::AnyStrippedStateEvent,