Update dependencies and bugfix

Author: EbTech

Cargo.lock

@@ -1309,3 +1309,85 @@
 1700
 1696
 1698
+1699
+1701
+1702
+1703
+1705
+1708
+1707
+1706
+1709
+1711
+1704
+1714
+1716
+1713
+1712
+1719
+1718
+1720
+1715
+1721
+1722
+1717
+1728
+1729
+1733
+1734
+1730
+1739
+1738
+1735
+1737
+1736
+1741
+1742
+1746
+1744
+1743
+1749
+1754
+1753
+1732
+1740
+1747
+1750
+1748
+1759
+1761
+1760
+1758
+1764
+1771
+1766
+1762
+1767
+1774
+1772
+1763
+1731
+1770
+1779
+1768
+1783
+1775
+1782
+1781
+1777
+1792
+1790
+1787
+1778
+1791
+1786
+1785
+1784
+1788
+1793
+1795
+1789
+1799
+1796
+1800
+1794

data/codeforces/contest_ids.csv

@@ -12,24 +12,24 @@ categories = ["algorithms", "mathematics", "game-development"]
 license = "MIT"
 
 [dependencies]
-rayon = "1.5"
-reqwest = { version = "0.11.9", features = ["json", "blocking"] }
+rayon = "1.7"
+reqwest = { version = "0.11.14", features = ["json", "blocking"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-statrs = "0.15.0"
+statrs = "0.16.0"
 overload = "0.1.1"
-csv = "1.1"
-select = "0.6.0-alpha"
+csv = "1.2"
+select = "0.6.0"
 superslice = "1.0"
-tracing = "0.1.32"
-tracing-subscriber = "0.3.9"
-smallvec = { version = "1.8", features = ["union"] }
+tracing = "0.1.37"
+tracing-subscriber = "0.3.16"
+smallvec = { version = "1.10", features = ["union"] }
 rand = "0.8.5"
 json5 = "0.4.1"
 #f128 = "0.2.9"    (formerly used to test high-precision TrueSkill, but requires GCC's __float128)
-num-traits = "0.2.14"
-itertools = "0.10.3"
-chrono = "0.4.19"
+num-traits = "0.2.15"
+itertools = "0.10.5"
+chrono = "0.4.23"
 
 [[bin]]
 name = "rate"

multi-skill/Cargo.toml

@@ -31,7 +31,7 @@ impl<'a, I: Iterator<Item = Node<'a>>> Iterator for ArchiveRows<'a, I> {
             // This contest has no scoreboard, so skip it
             self.next()
         } else {
-            let node = url_cell.select(Name("a")).next().unwrap();
+            let node = url_cell.find(Name("a")).next().unwrap();
             let path = node.attr("href").unwrap();
             let id = path.strip_prefix("/event/").unwrap();
             Some(id.parse().unwrap())
@@ -59,14 +59,14 @@ for (contest_url, title, time_string) in table {
     tracing::info!("{} {} {}", contest_url, title, time_string);
     let contest_req = client.get(contest_url);
     let contest_page = request(contest_req).expect("Failed HTTP status");
-    let title2 = contest_page.select(Name("h2")).next().unwrap().text();
+    let title2 = contest_page.find(Name("h2")).next().unwrap().text();
     assert_eq!(title, title2);
-    let time2 = contest_page.select(Name("p")).next().unwrap().text();
+    let time2 = contest_page.find(Name("p")).next().unwrap().text();
     let time2 = time2.split("— ").nth(1).unwrap();
     let time2 = time2.split(" UTC").next().unwrap();
     assert_eq!(time_string, time2);
     let table = ScoreboardRows {
-        table: year_page.select(Name("td")),
+        table: year_page.find(Name("td")),
     };
 }
 */
@@ -85,7 +85,7 @@ fn main() {
             let req = client.get(url);
             let page = request(req).expect("Failed HTTP status");
             let table = ArchiveRows {
-                table: page.select(Name("td")),
+                table: page.find(Name("td")),
             };
             let urls = table.collect::<Vec<_>>();
             urls.into_iter().rev()

multi-skill/src/bin/ctf.rs

@@ -56,7 +56,7 @@ fn request(builder: RequestBuilder) -> Result<Document, StatusCode> {
 
 fn get_range(page: &Document, property_name: &str) -> RangeInclusive<u32> {
     let node = page
-        .select(Attr("name", property_name))
+        .find(Attr("name", property_name))
         .next()
         .unwrap_or_else(|| panic!("Can't find node with name={}", property_name));
     let min: u32 = node
@@ -75,7 +75,7 @@ fn get_range(page: &Document, property_name: &str) -> RangeInclusive<u32> {
 fn get_dates_and_urls(page: &Document) -> Vec<(u32, String)> {
     let mut res: Vec<(u32, String)> = Vec::new();
     // Every second one is a date
-    for row in page.select(And(Class("t1n"), Name("tr"))) {
+    for row in page.find(And(Class("t1n"), Name("tr"))) {
         let children: Vec<_> = row.children().collect();
         assert_eq!(children.len(), 2);
 
@@ -98,7 +98,7 @@ fn get_rounds(page: &Document) -> impl Iterator<Item = String> + '_ {
         And(Class("t2b"), Name("td")),
         Or(Name("a"), And(Class("t2n"), Name("td"))),
     );
-    page.select(pred).skip(5).map(|node| {
+    page.find(pred).skip(5).map(|node| {
         if node.name() == Some("a") {
             // Delimit round names with special characters
             "$ ".to_string() + &node.text()
@@ -179,7 +179,7 @@ fn main() {
                             comp_url
                         );
 
-                        let contest_name = match comp_page.select(Class("h4")).next() {
+                        let contest_name = match comp_page.find(Class("h4")).next() {
                             Some(node) => node.text(),
                             None => "Nameless Contest".to_string(),
                         };
@@ -197,7 +197,7 @@ fn main() {
                                         &round_name,
                                         &mut num_rounds,
                                         /*This can be scraped from the O2CM results search. We'll leave it for now*/
-                                        Utc.ymd(inyear as i32, inmonth, inday).and_hms(0, 0, 0),
+                                        Utc.with_ymd_and_hms(inyear as i32, inmonth, inday, 0, 0, 0).unwrap(),
                                     );
                                 }
                                 round_name = tokens[1..tokens.len()].join(" ").to_string();
@@ -235,7 +235,7 @@ fn main() {
                             &contest_name,
                             &round_name,
                             &mut num_rounds,
-                            Utc.ymd(inyear as i32, inmonth, inday).and_hms(0, 0, 0),
+                            Utc.with_ymd_and_hms(inyear as i32, inmonth, inday, 0, 0, 0).unwrap(),
                         );
                     }
                     Err(status) => {

multi-skill/src/bin/dance.rs

@@ -283,7 +283,7 @@ mod test {
         let first_contest = dataset.get(0);
         let first_winner = &first_contest.standings[0];
 
-        assert_eq!(first_contest.weight, 1.);
+        assert_eq!(first_contest.rating_params.weight, 1.);
         assert_eq!(first_contest.standings.len(), 66);
         assert_eq!(first_winner.0, "vepifanov");
         assert_eq!(first_winner.1, 0);

multi-skill/src/data_processing/mod.rs

@@ -254,7 +254,7 @@ impl RatingSystem for EloMMR {
             .map(|(player, lo, _)| {
                 let (sig_perf, discrete_drift) =
                     self.sig_perf_and_drift(params.weight, player.times_played_excl());
-                let continuous_drift = self.drift_per_sec * player.update_time as f64;
+                let continuous_drift = self.drift_per_sec * player.delta_time as f64;
                 let sig_drift = (discrete_drift + continuous_drift).sqrt();
                 match self.variant {
                     // if transfer_speed is infinite or the prior is Gaussian, the logistic

multi-skill/src/systems/elo_mmr.rs

@@ -67,7 +67,7 @@ impl RatingSystem for SimpleEloMMR {
     fn individual_update(&self, params: ContestRatingParams, player: &mut Player, mu_perf: f64) {
         let (sig_perf, discrete_drift) =
             self.sig_perf_and_drift(params.weight, player.times_played_excl());
-        let continuous_drift = self.drift_per_sec * player.update_time as f64;
+        let continuous_drift = self.drift_per_sec * player.delta_time as f64;
         let sig_drift = (discrete_drift + continuous_drift).sqrt();
         player.add_noise_best(sig_drift, self.transfer_speed);
 
@@ -94,7 +94,7 @@ impl RatingSystem for SimpleEloMMR {
             .map(|(player, _, _)| {
                 let (sig_perf, discrete_drift) =
                     self.sig_perf_and_drift(params.weight, player.times_played_excl());
-                let continuous_drift = self.drift_per_sec * player.update_time as f64;
+                let continuous_drift = self.drift_per_sec * player.delta_time as f64;
                 let sig_drift = (discrete_drift + continuous_drift).sqrt();
                 player.add_noise_best(sig_drift, self.transfer_speed);
                 player.approx_posterior.with_noise(sig_perf).into()

multi-skill/src/systems/simple_elo_mmr.rs

@@ -15,37 +15,37 @@ name = "worldrank-api"
 multi-skill = { path = "../multi-skill" }
 
 serde = { version = "1.0", features = ["derive"]}
-sqlx = { version = "0.5.9", default-features = false, features = ["runtime-actix-rustls", "macros", "postgres", "uuid", "chrono", "migrate", "offline"] }
-config = "0.11.0"
-#actix-http = "=3.0.0-beta.8"
-#actix-service = "=2.0"
-actix-web = "4.0"
-tokio = { version = "1.17", features = ["macros"] }
-uuid = { version = "0.8.2", features = ["v4"] }
-chrono = "0.4.19"
-reqwest = { version = "0.11.9", default-features = false, features = ["json", "rustls-tls"] }
-tracing = "0.1.32"
+sqlx = { version = "0.6.2", default-features = false, features = ["runtime-actix-rustls", "macros", "postgres", "uuid", "chrono", "migrate", "offline"] }
+config = "0.13.3"
+#actix-http = "3.3"
+#actix-service = "2.0"
+actix-web = "4.3"
+tokio = { version = "1.26", features = ["macros"] }
+uuid = { version = "1.3", features = ["v4"] }
+chrono = "0.4.23"
+reqwest = { version = "0.11.14", default-features = false, features = ["json", "rustls-tls"] }
+tracing = "0.1.37"
 #tracing-futures = "0.2.5"
-tracing-subscriber = { version = "0.3.9", features = ["registry", "env-filter"] }
-tracing-bunyan-formatter = "0.3.2"
-tracing-log = "0.1.2"
-tracing-actix-web = "0.5.1"
-tracing-appender = "0.2.1"
-serde-aux = "3.0"
-unicode-segmentation = "1.9"
+tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] }
+tracing-bunyan-formatter = "0.3.6"
+tracing-log = "0.1.3"
+tracing-actix-web = "0.7.2"
+tracing-appender = "0.2.2"
+serde-aux = "4.1"
+unicode-segmentation = "1.10"
 thiserror = "1.0"
 anyhow = "1.0"
-csv = "1.1"
+csv = "1.2"
 superslice = "1.0"
 
 [dev-dependencies]
-#actix-rt = "2.7"
-claim = "0.5.0"
-#fake = "2.4"
+#actix-rt = "2.8"
+claims = "0.7.1"
+#fake = "2.5"
 fake = "~2.3"
-once_cell = "1.10"
+once_cell = "1.17"
 #quickcheck = "1.0"
 quickcheck = "0.9.2"
 quickcheck_macros = "1.0"
 serde_json = "1.0"
-wiremock = "0.5.11"
+wiremock = "0.5.17"

worldrank-api/Cargo.toml

@@ -1,7 +1,6 @@
 use serde_aux::field_attributes::deserialize_number_from_string;
 use sqlx::postgres::PgConnectOptions;
 use sqlx::postgres::PgSslMode;
-use std::convert::{TryFrom, TryInto}; // TODO: remove this import after 2021 edition
 
 #[derive(Clone, serde::Deserialize)]
 pub struct Settings {
@@ -51,27 +50,26 @@ impl DatabaseSettings {
 }
 
 pub fn get_configuration() -> Result<Settings, config::ConfigError> {
-    let mut settings = config::Config::default();
-
     // Detect the running environment.
     let base_path = std::env::current_dir().expect("Failed to determine the current directory");
     let configuration_directory = base_path.join("configuration");
-    settings.merge(config::File::from(configuration_directory.join("base")).required(true))?;
-
+    
     // Layer on the environment-specific values.
     let environment: Environment = std::env::var("APP_ENVIRONMENT")
         .unwrap_or_else(|_| "local".into())
         .try_into()
         .expect("Failed to parse APP_ENVIRONMENT.");
-    settings.merge(
-        config::File::from(configuration_directory.join(environment.as_str())).required(true),
-    )?;
-
-    // Add in settings from environment variables (with a prefix of APP and '__' as separator)
-    // E.g. `APP_APPLICATION__PORT=5001 would set `Settings.application.port`
-    settings.merge(config::Environment::with_prefix("app").separator("__"))?;
+    
+    let environment_filename = format!("{}.yml", environment.as_str());
+    let settings = config::Config::builder()
+        .add_source(config::File::from(configuration_directory.join("base.yml")))
+        .add_source(config::File::from(configuration_directory.join(&environment_filename)))
+        // Add in settings from environment variables (with a prefix of APP and '__' as separator)
+        // E.g. `APP_APPLICATION__PORT=5001 would set `Settings.application.port`
+        .add_source(config::Environment::with_prefix("APP").prefix_separator("_").separator("__"))
+        .build()?;
 
-    settings.try_into()
+    settings.try_deserialize::<Settings>()
 }
 
 /// The runtime environment for our application.