revert(scaling for encrypted tally only): tally fragment

Author: cong-or

src/chain-libs/chain-impl-mockchain/src/vote/tally.rs

@@ -3,18 +3,7 @@ use crate::{
     value::Value,
     vote::{Choice, Options},
 };
-
 use chain_vote::EncryptedTally;
-use core::cmp::Ordering;
-use num::FromPrimitive;
-
-use num::Rational32;
-use rug::Integer;
-use rug::{float::Round, ops::Pow, Float, Rational};
-
-use std::str::FromStr;
-
-use std::env;
 use std::fmt;
 use thiserror::Error;
 
@@ -177,39 +166,7 @@ impl TallyResult {
         } else {
             let index = choice.as_byte() as usize;
 
-            const GAMMA: &str = "QUADRATIC_VOTING_GAMMA";
-            const PRECISION: &str = "QUADRATIC_VOTING_PRECISION";
-
-            // Apply quadratic scaling if gamma value specified in env var. Else gamma is 1 and has no effect.
-            let mut gamma = f64::from_str(&env::var(GAMMA).unwrap_or(1.0.to_string())).unwrap();
-            // Gamma must be between 0 and 1, anything else is treated as bad input; defaulting gamma to 1.
-            if gamma < 0.0 || gamma > 1.0 {
-                gamma = 1.0;
-            }
-
-            let precision =
-                u32::from_str(&env::var(PRECISION).unwrap_or(1.to_string())).unwrap_or(1);
-
-            let gamma = Rational32::from_f64(gamma).unwrap_or(Rational32::from_integer(1));
-            let denom = gamma.denom();
-            let numer = gamma.numer();
-
-            let stake = Float::with_val(precision, weight.0);
-
-            // rational = gamma in rational form i.e fraction
-            // 0.5 = 1/2
-            let gamma = Float::with_val(precision, &Rational::from((*numer, *denom)));
-
-            let stake_with_gamma_scaling = stake.clone().pow(&gamma);
-
-            let weight = stake_with_gamma_scaling
-                .to_integer_round(Round::Nearest)
-                .unwrap_or((Integer::from(weight.0), Ordering::Less))
-                .0
-                .to_u64()
-                .unwrap_or(weight.0);
-
-            self.results[index] = self.results[index].saturating_add(Weight(weight));
+            self.results[index] = self.results[index].saturating_add(weight);
 
             Ok(())
         }