From 0422797b46eac94f2303fade340473e80eadf2a0 Mon Sep 17 00:00:00 2001 From: Yury Akudovich Date: Wed, 16 Oct 2024 19:21:59 +0200 Subject: [PATCH] Fix lint and test. --- contracts | 2 +- core/lib/protobuf_config/src/prover_autoscaler.rs | 2 +- .../crates/bin/prover_autoscaler/src/global/scaler.rs | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/contracts b/contracts index 84d5e3716f6..aafee035db8 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 84d5e3716f645909e8144c7d50af9dd6dd9ded62 +Subproject commit aafee035db892689df3f7afe4b89fd6467a39313 diff --git a/core/lib/protobuf_config/src/prover_autoscaler.rs b/core/lib/protobuf_config/src/prover_autoscaler.rs index 8f2ecf4ac50..e95e4003972 100644 --- a/core/lib/protobuf_config/src/prover_autoscaler.rs +++ b/core/lib/protobuf_config/src/prover_autoscaler.rs @@ -98,7 +98,7 @@ impl ProtoRepr for proto::ProverAutoscalerScalerConfig { let (cluster_and_gpu, max) = e.read().expect("max_provers"); if let Some((cluster, gpu)) = cluster_and_gpu.split_once('/') { acc.entry(cluster.to_string()) - .or_insert_with(HashMap::new) + .or_default() .insert(gpu.parse().expect("max_provers/gpu"), max); } acc diff --git a/prover/crates/bin/prover_autoscaler/src/global/scaler.rs b/prover/crates/bin/prover_autoscaler/src/global/scaler.rs index 0dd3b91a792..75c9e2e3e42 100644 --- a/prover/crates/bin/prover_autoscaler/src/global/scaler.rs +++ b/prover/crates/bin/prover_autoscaler/src/global/scaler.rs @@ -345,7 +345,14 @@ mod tests { let queuer = queuer::Queuer { prover_job_monitor_url: "".to_string(), }; - let scaler = Scaler::new(watcher, queuer, ProverAutoscalerScalerConfig::default()); + let scaler = Scaler::new( + watcher, + queuer, + ProverAutoscalerScalerConfig { + max_provers: HashMap::from([("foo".to_string(), HashMap::from([(Gpu::L4, 100)]))]), + ..Default::default() + }, + ); let got = scaler.run( &"prover".to_string(), 1499, @@ -383,6 +390,6 @@ mod tests { }, 3, )]); - assert!(got == want); + assert_eq!(got, want); } }