diff --git a/tests/event_auth.rs b/tests/event_auth.rs index 7ed7d44a..fe3df512 100644 --- a/tests/event_auth.rs +++ b/tests/event_auth.rs @@ -2,7 +2,6 @@ use std::{collections::BTreeMap, convert::TryFrom, sync::Arc}; use ruma::{ events::{ - pdu::EventHash, room::{ join_rules::JoinRule, member::{MemberEventContent, MembershipState}, @@ -110,27 +109,27 @@ where .iter() .map(AsRef::as_ref) .map(event_id) - .map(|id| { - ( - id, - EventHash { - sha256: "hello".into(), - }, - ) - }) + // .map(|id| { + // ( + // id, + // EventHash { + // sha256: "hello".into(), + // }, + // ) + // }) .collect::>(); let prev_events = prev_events .iter() .map(AsRef::as_ref) .map(event_id) - .map(|id| { - ( - id, - EventHash { - sha256: "hello".into(), - }, - ) - }) + // .map(|id| { + // ( + // id, + // EventHash { + // sha256: "hello".into(), + // }, + // ) + // }) .collect::>(); let json = if let Some(state_key) = state_key { diff --git a/tests/event_sorting.rs b/tests/event_sorting.rs index f3e981e3..8897a4a2 100644 --- a/tests/event_sorting.rs +++ b/tests/event_sorting.rs @@ -2,7 +2,6 @@ use std::{collections::BTreeMap, convert::TryFrom, sync::Arc}; use ruma::{ events::{ - pdu::EventHash, room::{ join_rules::JoinRule, member::{MemberEventContent, MembershipState}, @@ -92,27 +91,11 @@ where .iter() .map(AsRef::as_ref) .map(event_id) - .map(|id| { - ( - id, - EventHash { - sha256: "hello".into(), - }, - ) - }) .collect::>(); let prev_events = prev_events .iter() .map(AsRef::as_ref) .map(event_id) - .map(|id| { - ( - id, - EventHash { - sha256: "hello".into(), - }, - ) - }) .collect::>(); let json = if let Some(state_key) = state_key { diff --git a/tests/res_with_auth_ids.rs b/tests/res_with_auth_ids.rs index c88fd66a..e5e22e1e 100644 --- a/tests/res_with_auth_ids.rs +++ b/tests/res_with_auth_ids.rs @@ -1,10 +1,14 @@ #![allow(clippy::or_fun_call, clippy::expect_fun_call)] -use std::{collections::BTreeMap, convert::TryFrom, sync::Arc, sync::Once, time::UNIX_EPOCH}; +use std::{ + collections::BTreeMap, + convert::TryFrom, + sync::{Arc, Once}, + time::UNIX_EPOCH, +}; use ruma::{ events::{ - pdu::EventHash, room::{ join_rules::JoinRule, member::{MemberEventContent, MembershipState}, @@ -278,27 +282,11 @@ where .iter() .map(AsRef::as_ref) .map(event_id) - .map(|id| { - ( - id, - EventHash { - sha256: "hello".into(), - }, - ) - }) .collect::>(); let prev_events = prev_events .iter() .map(AsRef::as_ref) .map(event_id) - .map(|id| { - ( - id, - EventHash { - sha256: "hello".into(), - }, - ) - }) .collect::>(); let json = if let Some(state_key) = state_key { diff --git a/tests/state_res.rs b/tests/state_res.rs index 116a0b36..1609d377 100644 --- a/tests/state_res.rs +++ b/tests/state_res.rs @@ -3,7 +3,6 @@ use std::{collections::BTreeMap, convert::TryFrom, sync::Arc, time::UNIX_EPOCH}; use maplit::btreemap; use ruma::{ events::{ - pdu::EventHash, room::{ join_rules::JoinRule, member::{MemberEventContent, MembershipState}, @@ -97,27 +96,11 @@ where .iter() .map(AsRef::as_ref) .map(event_id) - .map(|id| { - ( - id, - EventHash { - sha256: "hello".into(), - }, - ) - }) .collect::>(); let prev_events = prev_events .iter() .map(AsRef::as_ref) .map(event_id) - .map(|id| { - ( - id, - EventHash { - sha256: "hello".into(), - }, - ) - }) .collect::>(); let json = if let Some(state_key) = state_key { @@ -496,7 +479,7 @@ fn ban_vs_power_level() { let edges = vec![ vec!["END", "MB", "MA", "PA", "START"], - vec!["END", "PB", "PA"], + vec!["END", "PA", "PB"], ] .into_iter() .map(|list| list.into_iter().map(event_id).collect::>())