chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tests to new StateEvent using Pdu::RoomV3Pdu

Browse Source
This commit is contained in:
Devin Ragotzy 2020-11-01 18:48:23 -05:00
parent 6661771b31
commit ac4ab7ac06
4 changed files with 23 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/event_auth.rs
View File

@ -2,7 +2,6 @@ use std::{collections::BTreeMap, convert::TryFrom, sync::Arc};
use ruma::{ use ruma::{
events::{ events::{
pdu::EventHash,
room::{ room::{
join_rules::JoinRule, join_rules::JoinRule,
member::{MemberEventContent, MembershipState}, member::{MemberEventContent, MembershipState},
@ -110,27 +109,27 @@ where
.iter() .iter()
.map(AsRef::as_ref) .map(AsRef::as_ref)
.map(event_id) .map(event_id)
.map(|id| { // .map(|id| {
( // (
id, // id,
EventHash { // EventHash {
sha256: "hello".into(), // sha256: "hello".into(),
}, // },
) // )
}) // })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let prev_events = prev_events let prev_events = prev_events
.iter() .iter()
.map(AsRef::as_ref) .map(AsRef::as_ref)
.map(event_id) .map(event_id)
.map(|id| { // .map(|id| {
( // (
id, // id,
EventHash { // EventHash {
sha256: "hello".into(), // sha256: "hello".into(),
}, // },
) // )
}) // })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let json = if let Some(state_key) = state_key { let json = if let Some(state_key) = state_key {

17
tests/event_sorting.rs
View File

@ -2,7 +2,6 @@ use std::{collections::BTreeMap, convert::TryFrom, sync::Arc};
use ruma::{ use ruma::{
events::{ events::{
pdu::EventHash,
room::{ room::{
join_rules::JoinRule, join_rules::JoinRule,
member::{MemberEventContent, MembershipState}, member::{MemberEventContent, MembershipState},
@ -92,27 +91,11 @@ where
.iter() .iter()
.map(AsRef::as_ref) .map(AsRef::as_ref)
.map(event_id) .map(event_id)
.map(|id| {
(
id,
EventHash {
sha256: "hello".into(),
},
)
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let prev_events = prev_events let prev_events = prev_events
.iter() .iter()
.map(AsRef::as_ref) .map(AsRef::as_ref)
.map(event_id) .map(event_id)
.map(|id| {
(
id,
EventHash {
sha256: "hello".into(),
},
)
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let json = if let Some(state_key) = state_key { let json = if let Some(state_key) = state_key {

24
tests/res_with_auth_ids.rs
View File

@ -1,10 +1,14 @@
#![allow(clippy::or_fun_call, clippy::expect_fun_call)] #![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::{ use ruma::{
events::{ events::{
pdu::EventHash,
room::{ room::{
join_rules::JoinRule, join_rules::JoinRule,
member::{MemberEventContent, MembershipState}, member::{MemberEventContent, MembershipState},
@ -278,27 +282,11 @@ where
.iter() .iter()
.map(AsRef::as_ref) .map(AsRef::as_ref)
.map(event_id) .map(event_id)
.map(|id| {
(
id,
EventHash {
sha256: "hello".into(),
},
)
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let prev_events = prev_events let prev_events = prev_events
.iter() .iter()
.map(AsRef::as_ref) .map(AsRef::as_ref)
.map(event_id) .map(event_id)
.map(|id| {
(
id,
EventHash {
sha256: "hello".into(),
},
)
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let json = if let Some(state_key) = state_key { let json = if let Some(state_key) = state_key {

19
tests/state_res.rs
View File

@ -3,7 +3,6 @@ use std::{collections::BTreeMap, convert::TryFrom, sync::Arc, time::UNIX_EPOCH};
use maplit::btreemap; use maplit::btreemap;
use ruma::{ use ruma::{
events::{ events::{
pdu::EventHash,
room::{ room::{
join_rules::JoinRule, join_rules::JoinRule,
member::{MemberEventContent, MembershipState}, member::{MemberEventContent, MembershipState},
@ -97,27 +96,11 @@ where
.iter() .iter()
.map(AsRef::as_ref) .map(AsRef::as_ref)
.map(event_id) .map(event_id)
.map(|id| {
(
id,
EventHash {
sha256: "hello".into(),
},
)
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let prev_events = prev_events let prev_events = prev_events
.iter() .iter()
.map(AsRef::as_ref) .map(AsRef::as_ref)
.map(event_id) .map(event_id)
.map(|id| {
(
id,
EventHash {
sha256: "hello".into(),
},
)
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let json = if let Some(state_key) = state_key { let json = if let Some(state_key) = state_key {
@ -496,7 +479,7 @@ fn ban_vs_power_level() {
let edges = vec![ let edges = vec![
vec!["END", "MB", "MA", "PA", "START"], vec!["END", "MB", "MA", "PA", "START"],
vec!["END", "PB", "PA"], vec!["END", "PA", "PB"],
] ]
.into_iter() .into_iter()
.map(|list| list.into_iter().map(event_id).collect::<Vec<_>>()) .map(|list| list.into_iter().map(event_id).collect::<Vec<_>>())