From 5f34f49d17944564d757708e2aa70383e650d96d Mon Sep 17 00:00:00 2001 From: onyinyang Date: Tue, 12 Mar 2024 11:36:32 -0400 Subject: [PATCH] Formatting changes from cargo fmt --- crates/lox-distributor/src/resource_parser.rs | 6 ++-- crates/lox-library/src/tests.rs | 5 ++- crates/lox-wasm/src/lib.rs | 35 ++++++++++--------- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/crates/lox-distributor/src/resource_parser.rs b/crates/lox-distributor/src/resource_parser.rs index fef43d5..a506a19 100644 --- a/crates/lox-distributor/src/resource_parser.rs +++ b/crates/lox-distributor/src/resource_parser.rs @@ -188,7 +188,7 @@ mod tests { "123.456.789.100".to_owned(), 3002, "BE84A97D02130470A1C77839954392BA979F7EE1".to_owned(), - ACCEPTED_HOURS_OF_FAILURE-1, + ACCEPTED_HOURS_OF_FAILURE - 1, ); let resource_two = make_resource( "https".to_owned(), @@ -202,7 +202,7 @@ mod tests { "123.222.333.444".to_owned(), 6002, "C56B9EF202130470A1C77839954392BA979F7FF9".to_owned(), - ACCEPTED_HOURS_OF_FAILURE+2, + ACCEPTED_HOURS_OF_FAILURE + 2, ); let resource_three = make_resource( "scramblesuit".to_owned(), @@ -216,7 +216,7 @@ mod tests { "443.288.222.100".to_owned(), 3042, "5E3A8BD902130470A1C77839954392BA979F7B46".to_owned(), - ACCEPTED_HOURS_OF_FAILURE+1, + ACCEPTED_HOURS_OF_FAILURE + 1, ); let resource_four = make_resource( "https".to_owned(), diff --git a/crates/lox-library/src/tests.rs b/crates/lox-library/src/tests.rs index 1e7b085..e7bee96 100644 --- a/crates/lox-library/src/tests.rs +++ b/crates/lox-library/src/tests.rs @@ -1065,7 +1065,10 @@ fn test_bridge_replace() { // Case zero: bridge to be replaced is not in the bridgetable let random_bridgeline = BridgeLine::random(); assert!( - !th.ba.bridge_table.reachable.contains_key(&random_bridgeline), + !th.ba + .bridge_table + .reachable + .contains_key(&random_bridgeline), "Random bridgeline happens to be in the bridge_table (and should not be)" ); assert!( diff --git a/crates/lox-wasm/src/lib.rs b/crates/lox-wasm/src/lib.rs index da2a578..de93383 100644 --- a/crates/lox-wasm/src/lib.rs +++ b/crates/lox-wasm/src/lib.rs @@ -831,29 +831,32 @@ pub fn get_next_unlock(constants_str: String, lox_cred_str: String) -> Result { - let mut blockage_days = days_to_next_level; - let mut count = 1; - while trust_level + count < constants.min_blockage_migration_trust_level { - blockage_days += constants.level_interval[trust_level as usize + count as usize]; - count += 1; - } - blockage_days + let days_to_blockage_migration_unlock = match trust_level + < constants.min_blockage_migration_trust_level + { + // If the credential is greater than the minimum level that enables + // migrating after a blockage, the time to unlock is 0, otherwise we + // add the time to upgrade until that level + true => { + let mut blockage_days = days_to_next_level; + let mut count = 1; + while trust_level + count < constants.min_blockage_migration_trust_level { + blockage_days += constants.level_interval[trust_level as usize + count as usize]; + count += 1; } - false => 0, - }; + blockage_days + } + false => 0, + }; let day_of_level_unlock = (scalar_u32(&lox_cred.lox_credential.level_since).unwrap() + days_to_next_level) as i32; let level_unlock_date = JulianDay::new(day_of_level_unlock).to_date(); let day_of_invite_unlock = (scalar_u32(&lox_cred.lox_credential.level_since).unwrap() + days_to_invite_inc) as i32; let invite_unlock_date = JulianDay::new(day_of_invite_unlock).to_date(); - let day_of_blockage_migration_unlock = (scalar_u32(&lox_cred.lox_credential.level_since).unwrap() + days_to_blockage_migration_unlock) as i32; + let day_of_blockage_migration_unlock = (scalar_u32(&lox_cred.lox_credential.level_since) + .unwrap() + + days_to_blockage_migration_unlock) as i32; let blockage_migration_unlock_date = JulianDay::new(day_of_blockage_migration_unlock as i32).to_date(); let next_unlock: lox_utils::LoxNextUnlock = lox_utils::LoxNextUnlock {