nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Make sytest not fail

Browse source
This commit is contained in:
timokoesters 2020-06-03 14:16:56 +02:00
parent 1c85b0fd05
commit 8328eeb5ac
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
3 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/client_server.rs
View file

@ -55,8 +55,7 @@ use ruma_events::{
};
use ruma_identifiers::{DeviceId, RoomAliasId, RoomId, RoomVersionId, UserId};
use serde_json::{json, value::RawValue};
use crate::{server_server, utils, Database, MatrixResult, Ruma};
use crate::{utils, Database, MatrixResult, Ruma};
const GUEST_NAME_LENGTH: usize = 10;
const DEVICE_ID_LENGTH: usize = 10;

13
src/main.rs
View file

@ -6,12 +6,9 @@ mod database;
mod error;
mod pdu;
mod ruma_wrapper;
mod server_server;
//mod server_server;
mod utils;
#[cfg(test)]
mod test;
pub use database::Database;
pub use error::{Error, Result};
pub use pdu::PduEvent;
@ -87,10 +84,10 @@ fn setup_rocket() -> rocket::Rocket {
client_server::delete_device_route,
client_server::delete_devices_route,
client_server::options_route,
server_server::well_known_server,
server_server::get_server_version,
server_server::get_server_keys,
server_server::get_server_keys_deprecated,
//server_server::well_known_server,
//server_server::get_server_version,
//server_server::get_server_keys,
//server_server::get_server_keys_deprecated,
],
)
.attach(AdHoc::on_attach("Config", |rocket| {