Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor to avoid some (mostly hypothetical) races

Browse source 
Tidy up added code to reduce duplicity of X and X_internals.
This commit is contained in:
Conrad Irwin 2023-10-18 19:27:00 -06:00
parent 2b11463567
commit 3853009d92
13 changed files with 715 additions and 765 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/collab/src/db/tests/message_tests.rs
View file

@ -25,7 +25,7 @@ async fn test_channel_message_retrieval(db: &Arc<Database>) {
.await
.unwrap()
.user_id;
let channel = db.create_channel("channel", None, user).await.unwrap();
let channel = db.create_root_channel("channel", user).await.unwrap();
let owner_id = db.create_server("test").await.unwrap().0 as u32;
db.join_channel_chat(channel, rpc::ConnectionId { owner_id, id: 0 }, user)
@ -87,7 +87,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
.await
.unwrap()
.user_id;
let channel = db.create_channel("channel", None, user).await.unwrap();
let channel = db.create_root_channel("channel", user).await.unwrap();
let owner_id = db.create_server("test").await.unwrap().0 as u32;
@ -151,9 +151,9 @@ async fn test_channel_message_new_notification(db: &Arc<Database>) {
.unwrap()
.user_id;
let channel_1 = db.create_channel("channel", None, user).await.unwrap();
let channel_1 = db.create_root_channel("channel", user).await.unwrap();
let channel_2 = db.create_channel("channel-2", None, user).await.unwrap();
let channel_2 = db.create_root_channel("channel-2", user).await.unwrap();
db.invite_channel_member(channel_1, observer, user, ChannelRole::Member)
.await