stronger typing

Author: SimonRastikian

crates/contract/src/state/running.rs

@@ -271,7 +271,9 @@ pub mod running_tests {
     use crate::primitives::domain::AddDomainsVotes;
     use crate::primitives::test_utils::{NUM_PROTOCOLS, gen_proposed_threshold_params};
     use crate::primitives::threshold_votes::GovernanceThresholdParametersVotes;
-    use crate::primitives::thresholds::ProposedGovernanceThresholdParameters;
+    use crate::primitives::thresholds::{
+        GovernanceThreshold, ProposedGovernanceThresholdParameters,
+    };
     use crate::state::key_event::tests::Environment;
     use crate::state::test_utils::{
         gen_running_state, gen_running_state_with_params, gen_valid_params_proposal,
@@ -290,7 +292,7 @@ pub mod running_tests {
     fn setup_with_params(
         num_domains: usize,
         num_participants: usize,
-        governance_threshold: u64,
+        governance_threshold: impl Into<GovernanceThreshold>,
     ) -> (RunningContractState, Environment) {
         with_first_participant_signer(gen_running_state_with_params(
             num_domains,

crates/contract/src/state/test_utils.rs

@@ -99,7 +99,7 @@ pub fn gen_running_state(num_domains: usize) -> RunningContractState {
     gen_running_state_with_params(
         num_domains,
         parameters.participants().len(),
-        parameters.threshold().value(),
+        parameters.threshold(),
     )
 }
 
@@ -108,11 +108,11 @@ pub fn gen_running_state(num_domains: usize) -> RunningContractState {
 pub fn gen_running_state_with_params(
     num_domains: usize,
     num_participants: usize,
-    governance_threshold: u64,
+    governance_threshold: impl Into<GovernanceThreshold>,
 ) -> RunningContractState {
     let threshold_parameters = GovernanceThresholdParameters::new(
         gen_participants(num_participants),
-        GovernanceThreshold::new(governance_threshold),
+        governance_threshold.into(),
     )
     .expect("valid threshold parameters");