also take in account good assessments when computing consensus on exc…

…ellent ratings

catalyst-toolbox/src/rewards/veterans.rs

@@ -81,14 +81,20 @@ fn calc_final_ranking_consensus_per_review(rankings: &[impl Borrow<VeteranRankin
     let rankings_majority = Decimal::from(rankings.len()) / Decimal::from(2);
     let ranks = rankings.iter().counts_by(|r| r.borrow().score());
 
-    match (ranks.get(&FilteredOut), ranks.get(&Excellent)) {
-        (Some(filtered_out), _) if Decimal::from(*filtered_out) >= rankings_majority => {
+    match (ranks.get(&FilteredOut), ranks.get(&Excellent), ranks.get(&Good)) {
+        (Some(filtered_out), _, _) if Decimal::from(*filtered_out) >= rankings_majority => {
             Decimal::from(*filtered_out) / Decimal::from(rankings.len())
         }
-        (_, Some(excellent)) if Decimal::from(*excellent) > rankings_majority => {
+        (_, Some(excellent), _) if Decimal::from(*excellent) > rankings_majority => {
             Decimal::from(*excellent) / Decimal::from(rankings.len())
         }
-        _ => Decimal::from(*ranks.get(&Good).unwrap()) / Decimal::from(rankings.len()),
+        (_, Some(excellent), Some(good)) => {
+            (Decimal::from(*excellent) + Decimal::from(*good)) / Decimal::from(rankings.len())
+        }
+        (_, _, Some(good)) => {
+           Decimal::from(*good) / Decimal::from(rankings.len())
+        }
+        _ => Decimal::ONE,
     }
 }