From 13c1ddc01a5c7e338d5d24ba3538319467788cc6 Mon Sep 17 00:00:00 2001 From: _ <> Date: Mon, 15 Mar 2021 19:29:54 +0000 Subject: [PATCH] :bug: bug: fix tests not compiling --- crates/ptth_relay/src/scraper_api.rs | 6 +++--- src/main.rs | 6 +++--- src/tests.rs | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crates/ptth_relay/src/scraper_api.rs b/crates/ptth_relay/src/scraper_api.rs index ab391fc..8b4953e 100644 --- a/crates/ptth_relay/src/scraper_api.rs +++ b/crates/ptth_relay/src/scraper_api.rs @@ -290,10 +290,10 @@ mod tests { dev_mode: Default::default (), }, port: Some (4000), - servers: vec! [], - scraper_keys: vec! [ + servers: Some (vec! []), + scraper_keys: Some (vec! [ self.valid_key.map (|x| key_validity::ScraperKey::new_30_day ("automated test", x.as_bytes ())), - ].into_iter ().filter_map (|x| x).collect (), + ].into_iter ().filter_map (|x| x).collect ()), }; let config = config::Config::try_from (config_file).expect ("Can't load config"); diff --git a/src/main.rs b/src/main.rs index d0e8a23..cce7c79 100644 --- a/src/main.rs +++ b/src/main.rs @@ -34,14 +34,14 @@ async fn main () -> anyhow::Result <()> { let config_file = ptth_relay::config::file::Config { iso: Default::default (), port: Some (relay_port), - servers: vec! [ + servers: Some (vec! [ ptth_relay::config::file::Server { name: server_name.to_string (), tripcode, display_name: None, }, - ], - scraper_keys: vec! [], + ]), + scraper_keys: None, }; let config = ptth_relay::config::Config::try_from (config_file).expect ("Can't load config"); diff --git a/src/tests.rs b/src/tests.rs index 3401029..050decd 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -102,14 +102,14 @@ impl TestingRelay { let config_file = config::file::Config { iso: Default::default (), port: Some (testing_config.relay_port), - servers: vec! [ + servers: Some (vec! [ config::file::Server { name: testing_config.server_name.to_string (), tripcode, display_name: None, }, - ], - scraper_keys: vec! [], + ]), + scraper_keys: None, }; let cfg = config::Config::try_from (config_file).expect ("Can't load config"); @@ -279,10 +279,10 @@ async fn scraper_endpoints () { dev_mode: Default::default (), }, port: Some (4001), - servers: vec! [], - scraper_keys: vec! [ + servers: None, + scraper_keys: Some (vec! [ key_validity::ScraperKey::new_30_day ("automated testing", b"bogus") - ], + ]), }; let config = config::Config::try_from (config_file).expect ("Can't load config");