consensus: change sortition::Config::new

- Remove `step`
- Remove `committee_size`

consensus/src/execution_ctx.rs

@@ -407,14 +407,13 @@ impl<'a, DB: Database, T: Operations + 'static> ExecutionCtx<'a, DB, T> {
 
     pub fn get_sortition_config(
         &self,
-        size: usize,
         exclusion: Option<PublicKeyBytes>,
     ) -> sortition::Config {
         sortition::Config::new(
             self.round_update.seed(),
             self.round_update.round,
-            self.step(),
-            size,
+            self.iteration,
+            self.step_name(),
             exclusion,
         )
     }

consensus/src/phase.rs

@@ -29,18 +29,6 @@ macro_rules! await_phase {
     };
 }
 
-macro_rules! call_phase {
-    ($e:expr, $n:ident ( $($args:expr), *)) => {
-        {
-           match $e {
-                Phase::Proposal(p) => p.$n($($args,)*),
-                Phase::Validation(p) => p.$n($($args,)*),
-                Phase::Ratification(p) => p.$n($($args,)*),
-            }
-        }
-    };
-}
-
 pub enum Phase<T: Operations, D: Database> {
     Proposal(proposal::step::ProposalStep<T, D>),
     Validation(validation::step::ValidationStep<T>),
@@ -74,8 +62,6 @@ impl<T: Operations + 'static, D: Database + 'static> Phase<T, D> {
         let timeout = ctx.iter_ctx.get_timeout(ctx.step_name());
         debug!(event = "execute_step", ?timeout);
 
-        let size = call_phase!(self, get_committee_size());
-
         let exclusion = match ctx.step_name() {
             StepName::Proposal => None,
             _ => {
@@ -94,7 +80,7 @@ impl<T: Operations + 'static, D: Database + 'static> Phase<T, D> {
         // block.
         let step_committee = Committee::new(
             ctx.provisioners,
-            &ctx.get_sortition_config(size, exclusion),
+            &ctx.get_sortition_config(exclusion),
         );
 
         debug!(

consensus/src/proposal/step.rs

@@ -112,7 +112,4 @@ impl<T: Operations + 'static, D: Database> ProposalStep<T, D> {
     pub fn name(&self) -> &'static str {
         "sel"
     }
-    pub fn get_committee_size(&self) -> usize {
-        config::PROPOSAL_COMMITTEE_SIZE
-    }
 }

consensus/src/quorum/verifiers.rs

@@ -13,7 +13,6 @@ use crate::user::committee::{Committee, CommitteeSet};
 use crate::user::sortition;
 use bytes::Buf;
 
-use crate::config;
 use dusk_bytes::Serializable;
 use node_data::bls::PublicKey;
 use node_data::message::{marshal_signable_vote, Header, Message, Payload};
@@ -48,7 +47,6 @@ pub async fn verify_quorum(
                 seed,
                 &msg.header,
                 StepName::Validation,
-                config::VALIDATION_COMMITTEE_SIZE,
                 true,
             )
             .await
@@ -68,7 +66,6 @@ pub async fn verify_quorum(
                 seed,
                 &msg.header,
                 StepName::Ratification,
-                config::RATIFICATION_COMMITTEE_SIZE,
                 true,
             )
             .await
@@ -94,15 +91,13 @@ pub async fn verify_step_votes(
     seed: Seed,
     hdr: &Header,
     step_name: StepName,
-    committee_size: usize,
     enable_quorum_check: bool,
 ) -> Result<QuorumResult, Error> {
     if step_name == StepName::Proposal {
         return Err(Error::InvalidStepNum);
     }
 
     let iteration = hdr.iteration;
-    let step = step_name.to_step(iteration);
     let generator = committees_set
         .read()
         .await
@@ -112,8 +107,8 @@ pub async fn verify_step_votes(
     let cfg = sortition::Config::new(
         seed,
         hdr.round,
-        step,
-        committee_size,
+        hdr.iteration,
+        step_name,
         Some(generator),
     );
 

consensus/src/ratification/handler.rs

@@ -14,7 +14,6 @@ use tracing::{error, warn};
 
 use crate::aggregator::Aggregator;
 
-use crate::config;
 use crate::iteration_ctx::RoundCommittees;
 use crate::quorum::verifiers::verify_votes;
 use node_data::message::payload::{QuorumType, Ratification, ValidationResult};
@@ -219,8 +218,8 @@ impl RatificationHandler {
                         let cfg = sortition::Config::new(
                             ru.seed(),
                             ru.round,
-                            StepName::Validation.to_step(iter),
-                            config::VALIDATION_COMMITTEE_SIZE,
+                            iter,
+                            StepName::Validation,
                             Some(generator),
                         );
 

consensus/src/ratification/step.rs

@@ -5,7 +5,6 @@
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
 use crate::commons::{ConsensusError, Database, RoundUpdate};
-use crate::config;
 use crate::contract_state::Operations;
 use crate::execution_ctx::ExecutionCtx;
 use std::marker::PhantomData;
@@ -155,8 +154,4 @@ impl<T: Operations + 'static, DB: Database> RatificationStep<T, DB> {
     pub fn name(&self) -> &'static str {
         "ratification"
     }
-
-    pub fn get_committee_size(&self) -> usize {
-        config::RATIFICATION_COMMITTEE_SIZE
-    }
 }

consensus/src/user/provisioners.rs

@@ -4,8 +4,8 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
+use crate::user::sortition;
 use crate::user::stake::Stake;
-use crate::{config::PROPOSAL_COMMITTEE_SIZE, user::sortition};
 use node_data::bls::{PublicKey, PublicKeyBytes};
 use node_data::StepName;
 
@@ -171,12 +171,11 @@ impl Provisioners {
         seed: Seed,
         round: u64,
     ) -> PublicKeyBytes {
-        let step = StepName::Proposal.to_step(iteration);
         let cfg = sortition::Config::new(
             seed,
             round,
-            step,
-            PROPOSAL_COMMITTEE_SIZE,
+            iteration,
+            StepName::Proposal,
             None,
         );
         let committee_keys = Committee::new(self, &cfg);

consensus/src/user/sortition.rs

@@ -9,7 +9,12 @@ use num_bigint::Sign::Plus;
 
 use sha3::{Digest, Sha3_256};
 
-use node_data::{bls::PublicKeyBytes, ledger::Seed};
+use node_data::{bls::PublicKeyBytes, ledger::Seed, StepName};
+
+use crate::config::{
+    PROPOSAL_COMMITTEE_SIZE, RATIFICATION_COMMITTEE_SIZE,
+    VALIDATION_COMMITTEE_SIZE,
+};
 
 #[derive(Debug, Clone, Default, Eq, Hash, PartialEq)]
 pub struct Config {
@@ -24,10 +29,16 @@ impl Config {
     pub fn new(
         seed: Seed,
         round: u64,
-        step: u16,
-        committee_size: usize,
+        iteration: u8,
+        step: StepName,
         exclusion: Option<PublicKeyBytes>,
     ) -> Config {
+        let committee_size = match step {
+            StepName::Proposal => PROPOSAL_COMMITTEE_SIZE,
+            StepName::Ratification => RATIFICATION_COMMITTEE_SIZE,
+            StepName::Validation => VALIDATION_COMMITTEE_SIZE,
+        };
+        let step = step.to_step(iteration);
         Self {
             seed,
             round,

consensus/src/validation/step.rs

@@ -5,7 +5,6 @@
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
 use crate::commons::{ConsensusError, Database, RoundUpdate};
-use crate::config;
 use crate::contract_state::{CallParams, Operations};
 use crate::execution_ctx::ExecutionCtx;
 use crate::validation::handler;
@@ -220,7 +219,4 @@ impl<T: Operations + 'static> ValidationStep<T> {
     pub fn name(&self) -> &'static str {
         "validation"
     }
-    pub fn get_committee_size(&self) -> usize {
-        config::VALIDATION_COMMITTEE_SIZE
-    }
 }