Kill criticals (#311)

aderyn_core/src/detect/detector.rs

@@ -185,7 +185,6 @@ pub enum IssueSeverity {
     Low,
     Medium,
     High,
-    Critical,
 }
 
 impl Display for IssueSeverity {
@@ -195,7 +194,6 @@ impl Display for IssueSeverity {
             IssueSeverity::Low => "Low",
             IssueSeverity::Medium => "Medium",
             IssueSeverity::High => "High",
-            IssueSeverity::Critical => "Critical",
         };
         write!(f, "{}", issue_description).unwrap();
         Ok(())

aderyn_core/src/lib.rs

@@ -86,9 +86,6 @@ where
 
     for (issue, severity) in issues.into_iter().flatten() {
         match severity {
-            IssueSeverity::Critical => {
-                report.criticals.push(issue);
-            }
             IssueSeverity::High => {
                 report.highs.push(issue);
             }

aderyn_core/src/report/json_printer.rs

@@ -7,16 +7,15 @@ use crate::context::workspace_context::WorkspaceContext;
 use serde::Serialize;
 
 use super::{
-    printer::ReportPrinter, reporter::Report, CriticalIssues, FilesDetails, FilesSummary,
-    HighIssues, IssueCount, LowIssues, MediumIssues, NcIssues,
+    printer::ReportPrinter, reporter::Report, FilesDetails, FilesSummary, HighIssues, IssueCount,
+    LowIssues, MediumIssues, NcIssues,
 };
 
 #[derive(Serialize)]
 pub struct JsonContent {
     files_summary: FilesSummary,
     files_details: FilesDetails,
     issue_count: IssueCount,
-    critical_issues: CriticalIssues,
     high_issues: HighIssues,
     medium_issues: MediumIssues,
     low_issues: LowIssues,
@@ -32,7 +31,6 @@ pub struct JsonPrinter;
         "files_summary": {...},
         "files_details": {...},
         "issue_summary": {...},
-        "critical_issues": {...},
         "high_issues": {...},
     ...
     }
@@ -56,7 +54,6 @@ impl ReportPrinter<()> for JsonPrinter {
             files_summary: context.files_summary(),
             files_details: context.files_details(),
             issue_count: report.issue_count(),
-            critical_issues: report.critical_issues(),
             high_issues: report.high_issues(),
             medium_issues: report.medium_issues(),
             low_issues: report.low_issues(),

aderyn_core/src/report/markdown_printer.rs

@@ -38,7 +38,6 @@ impl ReportPrinter<()> for MarkdownReportPrinter {
         }
 
         let all_issues = vec![
-            (report.critical_issues().issues, "# Critical Issues\n", "C"),
             (report.high_issues().issues, "# High Issues\n", "H"),
             (report.medium_issues().issues, "# Medium Issues\n", "M"),
             (report.low_issues().issues, "# Low Issues\n", "L"),
@@ -147,7 +146,6 @@ impl MarkdownReportPrinter {
             // Start the markdown table
             writeln!(writer, "| Category | No. of Issues |")?;
             writeln!(writer, "| --- | --- |")?;
-            writeln!(writer, "| Critical | {} |", issue_count.critical)?;
             writeln!(writer, "| High | {} |", issue_count.high)?;
             writeln!(writer, "| Medium | {} |", issue_count.medium)?;
             writeln!(writer, "| Low | {} |", issue_count.low)?;
@@ -197,11 +195,6 @@ impl MarkdownReportPrinter {
         writeln!(writer, "  - [Issue Summary](#issue-summary)")?;
 
         let issues = [
-            (
-                &report.criticals,
-                "- [Critical Issues](#critical-issues)",
-                "C",
-            ),
             (&report.highs, "- [High Issues](#high-issues)", "H"),
             (&report.mediums, "- [Medium Issues](#medium-issues)", "M"),
             (&report.lows, "- [Low Issues](#low-issues)", "L"),

aderyn_core/src/report/mod.rs

@@ -39,7 +39,6 @@ pub struct FilesDetail {
 
 #[derive(Serialize)]
 pub struct IssueCount {
-    critical: usize,
     high: usize,
     medium: usize,
     low: usize,
@@ -61,11 +60,6 @@ pub struct IssueBody {
     instances: Vec<IssueInstance>,
 }
 
-#[derive(Serialize)]
-pub struct CriticalIssues {
-    issues: Vec<IssueBody>,
-}
-
 #[derive(Serialize)]
 pub struct HighIssues {
     issues: Vec<IssueBody>,

aderyn_core/src/report/reporter.rs

@@ -1,11 +1,9 @@
 use super::{
-    extract_issue_bodies, CriticalIssues, HighIssues, Issue, IssueCount, LowIssues, MediumIssues,
-    NcIssues,
+    extract_issue_bodies, HighIssues, Issue, IssueCount, LowIssues, MediumIssues, NcIssues,
 };
 
 #[derive(Default, PartialEq)]
 pub struct Report {
-    pub criticals: Vec<Issue>,
     pub highs: Vec<Issue>,
     pub mediums: Vec<Issue>,
     pub lows: Vec<Issue>,
@@ -15,20 +13,13 @@ pub struct Report {
 impl Report {
     pub fn issue_count(&self) -> IssueCount {
         IssueCount {
-            critical: self.criticals.len(),
             high: self.highs.len(),
             medium: self.mediums.len(),
             low: self.lows.len(),
             nc: self.ncs.len(),
         }
     }
 
-    pub fn critical_issues(&self) -> CriticalIssues {
-        CriticalIssues {
-            issues: extract_issue_bodies(&self.criticals),
-        }
-    }
-
     pub fn high_issues(&self) -> HighIssues {
         HighIssues {
             issues: extract_issue_bodies(&self.highs),

judgeops/current/report-config.judge.md

@@ -41,7 +41,6 @@ This report was generated by [Aderyn](https://github.com/Cyfrin/aderyn), a stati
 
 | Category | No. of Issues |
 | --- | --- |
-| Critical | 0 |
 | High | 0 |
 | Medium | 0 |
 | Low | 1 |

judgeops/current/report.judge.md

@@ -89,7 +89,6 @@ This report was generated by [Aderyn](https://github.com/Cyfrin/aderyn), a stati
 
 | Category | No. of Issues |
 | --- | --- |
-| Critical | 0 |
 | High | 2 |
 | Medium | 4 |
 | Low | 7 |

judgeops/samples/sample_db.json

@@ -2,42 +2,42 @@
   "metrics": {
     "centralization-risk": {
       "detector_name": "centralization-risk",
-      "true_positives": 5,
+      "true_positives": 4,
       "false_positives": 1,
-      "trigger_count": 6,
-      "experience": 7,
+      "trigger_count": 5,
+      "experience": 6,
       "current_severity": "Medium"
     },
     "delegate-call-in-loop": {
       "detector_name": "delegate-call-in-loop",
-      "true_positives": 5,
+      "true_positives": 4,
       "false_positives": 2,
-      "trigger_count": 7,
-      "experience": 7,
+      "trigger_count": 6,
+      "experience": 6,
       "current_severity": "High"
     },
     "push-zero-opcode": {
       "detector_name": "push-zero-opcode",
-      "true_positives": 5,
+      "true_positives": 4,
       "false_positives": 0,
-      "trigger_count": 5,
-      "experience": 7,
+      "trigger_count": 4,
+      "experience": 6,
       "current_severity": "Low"
     },
     "solmate-safe-transfer-lib": {
       "detector_name": "solmate-safe-transfer-lib",
-      "true_positives": 5,
+      "true_positives": 4,
       "false_positives": 1,
-      "trigger_count": 7,
-      "experience": 7,
+      "trigger_count": 6,
+      "experience": 6,
       "current_severity": "Medium"
     },
     "useless-public-function": {
       "detector_name": "useless-public-function",
-      "true_positives": 5,
+      "true_positives": 4,
       "false_positives": 0,
-      "trigger_count": 6,
-      "experience": 9,
+      "trigger_count": 5,
+      "experience": 8,
       "current_severity": "NC"
     }
   },

judgeops/src/main.rs

@@ -24,7 +24,6 @@ pub enum IssueSeverity {
     Low,
     Medium,
     High,
-    Critical,
 }
 
 impl Display for IssueSeverity {
@@ -34,7 +33,6 @@ impl Display for IssueSeverity {
             IssueSeverity::Low => "Low",
             IssueSeverity::Medium => "Medium",
             IssueSeverity::High => "High",
-            IssueSeverity::Critical => "Critical",
         };
         write!(f, "{}", issue_description).unwrap();
         Ok(())

judgeops/src/utils.rs

@@ -155,9 +155,7 @@ pub(crate) fn register_unseen_detectors(
             println!("Registering {} {}", detector_name, severity);
             // let assigned_severity: IssueSeverity = serde_json::from_str(&severity).unwrap();
 
-            let assigned_severity = if severity == &IssueSeverity::Critical.to_string() {
-                IssueSeverity::Critical
-            } else if severity == &IssueSeverity::High.to_string() {
+            let assigned_severity = if severity == &IssueSeverity::High.to_string() {
                 IssueSeverity::High
             } else if severity == &IssueSeverity::Medium.to_string() {
                 IssueSeverity::Medium

judgeops/src/watchtower/lightchaser.rs

@@ -109,7 +109,6 @@ impl InfersMetrics for Metrics {
         }
 
         match self.current_severity {
-            IssueSeverity::Critical => lc_accuracy == IssueSeverity::COUNT as u64,
             IssueSeverity::High => lc_accuracy >= IssueSeverity::COUNT as u64 - 1,
             IssueSeverity::Medium => lc_accuracy >= IssueSeverity::COUNT as u64 - 2,
             IssueSeverity::Low => lc_accuracy >= IssueSeverity::COUNT as u64 - 3,
@@ -408,7 +407,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 4);
+        assert!(current_metrics.lc_accuracy() == 3);
         assert!(current_metrics.is_acceptable());
 
         watchtower.take_feedback(Feedback {
@@ -422,7 +421,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 3);
+        assert!(current_metrics.lc_accuracy() == 2);
         assert!(current_metrics.is_acceptable());
 
         watchtower.take_feedback(Feedback {
@@ -436,7 +435,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 2);
+        assert!(current_metrics.lc_accuracy() == 1);
         assert!(!current_metrics.is_acceptable());
     }
 
@@ -503,7 +502,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 4);
+        assert!(current_metrics.lc_accuracy() == 3);
 
         watchtower.take_feedback(Feedback {
             positive_feedbacks: vec![],
@@ -516,7 +515,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 3);
+        assert!(current_metrics.lc_accuracy() == 2);
 
         watchtower.take_feedback(Feedback {
             positive_feedbacks: vec![],
@@ -529,7 +528,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 2);
+        assert!(current_metrics.lc_accuracy() == 1);
 
         watchtower.take_feedback(Feedback {
             positive_feedbacks: vec![IssueDetectorNamePool::CentralizationRisk.to_string()],
@@ -542,7 +541,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 3);
+        assert!(current_metrics.lc_accuracy() == 2);
 
         watchtower.take_feedback(Feedback {
             positive_feedbacks: vec![IssueDetectorNamePool::CentralizationRisk.to_string()],
@@ -555,7 +554,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 4);
+        assert!(current_metrics.lc_accuracy() == 3);
     }
 
     #[test]
@@ -578,7 +577,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 5);
+        assert!(current_metrics.lc_accuracy() == 4);
 
         watchtower.take_feedback(Feedback {
             positive_feedbacks: vec![IssueDetectorNamePool::CentralizationRisk.to_string()],
@@ -591,7 +590,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 5);
+        assert!(current_metrics.lc_accuracy() == 4);
     }
 
     #[test]
@@ -614,7 +613,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 5);
+        assert!(current_metrics.lc_accuracy() == 4);
 
         watchtower.take_feedback(Feedback {
             positive_feedbacks: vec![],
@@ -627,7 +626,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 4);
+        assert!(current_metrics.lc_accuracy() == 3);
 
         watchtower.take_feedback(Feedback {
             positive_feedbacks: vec![IssueDetectorNamePool::CentralizationRisk.to_string()],
@@ -640,7 +639,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 4);
+        assert!(current_metrics.lc_accuracy() == 3);
     }
 
     #[test]
@@ -663,7 +662,7 @@ mod lightchaser_tests {
 
         let current_metrics =
             watchtower.metrics(IssueDetectorNamePool::CentralizationRisk.to_string());
-        assert!(current_metrics.lc_accuracy() == 5);
+        assert!(current_metrics.lc_accuracy() == 4);
 
         for _ in 1..=5 {
             watchtower.take_feedback(Feedback {

report-config.json

@@ -1,7 +1,4 @@
 {
-  "critical_issues": {
-    "issues": []
-  },
   "detectors_used": [
     "push-zero-opcode",
     "useless-public-function"
@@ -46,7 +43,6 @@
     "issues": []
   },
   "issue_count": {
-    "critical": 0,
     "high": 0,
     "low": 1,
     "medium": 0,