exp (#915)

Author: TilakMaddy

aderyn_core/src/detect/detector.rs

@@ -113,7 +113,7 @@ pub fn get_all_detectors_names() -> Vec<String> {
 // Note to maintainers: DO NOT CHANGE THE ORDER OF THESE DERIVE ATTRIBUTES
 #[derive(Debug, PartialEq, EnumString, Display)]
 #[strum(serialize_all = "kebab-case")]
-pub(crate) enum IssueDetectorNamePool {
+pub enum IssueDetectorNamePool {
     IncorrectUseOfModifier,
     ReentrancyStateChange,
     StateVariableCouldBeImmutable,

aderyn_core/src/detect/experimental/mod.rs

@@ -76,17 +76,13 @@ impl IssueDetector for EmptyBlockDetector {
 #[cfg(test)]
 mod empty_block_tests {
 
-    use crate::detect::{
-        detector::IssueDetector,
-        test_utils::{load_solidity_source_unit, take_loader_lock},
-    };
+    use crate::detect::{detector::IssueDetector, test_utils::load_solidity_source_unit};
 
     use super::EmptyBlockDetector;
 
     #[test]
 
     fn test_empty_block_by_loading_contract_directly() {
-        let _lock = take_loader_lock();
         let context = load_solidity_source_unit("../tests/contract-playground/src/EmptyBlocks.sol");
 
         let mut detector = EmptyBlockDetector::default();

aderyn_core/src/detect/low/empty_block.rs

@@ -1,11 +1,9 @@
 pub mod detector;
-pub(crate) mod experimental;
 pub mod helpers;
 pub mod high;
 pub mod low;
 pub mod report;
 
-#[cfg(test)]
 pub mod test_utils;
 
 #[macro_export]

aderyn_core/src/detect/mod.rs

@@ -1,7 +1,10 @@
-#[cfg(test)]
-use crate::context::graph::{Transpose, WorkspaceCallGraph};
 use crate::{
-    ast::SourceUnit, context::workspace_context::WorkspaceContext, visitor::ast_visitor::Node,
+    ast::SourceUnit,
+    context::{
+        graph::{Transpose, WorkspaceCallGraph},
+        workspace_context::WorkspaceContext,
+    },
+    visitor::ast_visitor::Node,
 };
 use semver::Version;
 use solidity_ast::{

aderyn_core/src/detect/test_utils/load_source_unit.rs

@@ -1,18 +1,12 @@
 mod load_source_unit;
 
-use once_cell::sync::Lazy;
 use std::path::PathBuf;
 
 // Using `solc` to read AST given a source unit (i.e Solidity file)
 pub use load_source_unit::{
     load_multiple_solidity_source_units_into_single_context, load_solidity_source_unit,
 };
 
-pub(crate) fn take_loader_lock() -> impl Drop {
-    static LOCK: Lazy<std::sync::Mutex<()>> = Lazy::new(|| std::sync::Mutex::new(()));
-    LOCK.lock().unwrap()
-}
-
 fn ensure_valid_solidity_file(filepath: &str) -> PathBuf {
     let filepath = PathBuf::from(filepath);
 

aderyn_core/src/detect/test_utils/mod.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::collapsible_match)]
 use std::{collections::BTreeMap, error::Error};
 
-use crate::{
+use aderyn_core::{
     ast::NodeID,
     capture,
     context::{
@@ -90,14 +90,12 @@ impl IssueDetector for AncestralLineDemonstrator {
 
 #[cfg(test)]
 mod ancestral_line_demo_tests {
-    use crate::detect::{
-        detector::IssueDetector, experimental::ancestral_line::AncestralLineDemonstrator,
-    };
+    use super::*;
+    use aderyn_core::detect::{detector::IssueDetector, test_utils::load_solidity_source_unit};
 
     #[test]
-
     fn test_ancestral_line_demo() {
-        let context = crate::detect::test_utils::load_solidity_source_unit(
+        let context = load_solidity_source_unit(
             "../tests/contract-playground/src/parent_chain/ParentChainContract.sol",
         );
 

aderyn_core/src/detect/experimental/ancestral_line.rs renamed to aderyn_core/tests/ancestral_line.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::collapsible_match)]
 use std::{collections::BTreeMap, error::Error};
 
-use crate::{
+use aderyn_core::{
     ast::{NodeID, NodeType},
     capture,
     context::{
@@ -74,14 +74,13 @@ impl IssueDetector for ClosestAncestorDemonstrator {
 
 #[cfg(test)]
 mod closest_ancestor_demo_tests {
-    use crate::detect::{
-        detector::IssueDetector, experimental::closest_ancestor::ClosestAncestorDemonstrator,
-    };
+    use super::*;
+    use aderyn_core::detect::{detector::IssueDetector, test_utils::load_solidity_source_unit};
 
     #[test]
 
     fn test_closest_ancestor() {
-        let context = crate::detect::test_utils::load_solidity_source_unit(
+        let context = load_solidity_source_unit(
             "../tests/contract-playground/src/parent_chain/ParentChainContract.sol",
         );
 

aderyn_core/src/detect/experimental/closest_ancestor.rs renamed to aderyn_core/tests/closest_ancestor.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::collapsible_match)]
 use std::{collections::BTreeMap, error::Error};
 
-use crate::{
+use aderyn_core::{
     ast::{NodeID, NodeType},
     capture,
     context::{browser::GetImmediateChildren, workspace_context::WorkspaceContext},
@@ -74,14 +74,13 @@ impl IssueDetector for ImmediateChildrenDemonstrator {
 
 #[cfg(test)]
 mod child_chain_demo_tests {
-    use crate::detect::{
-        detector::IssueDetector, experimental::immediate_children::ImmediateChildrenDemonstrator,
-    };
+    use super::*;
+    use aderyn_core::detect::test_utils::load_solidity_source_unit;
 
     #[test]
 
     fn test_immediate_child_demo() {
-        let context = crate::detect::test_utils::load_solidity_source_unit(
+        let context = load_solidity_source_unit(
             "../tests/contract-playground/src/parent_chain/ParentChainContract.sol",
         );
 

aderyn_core/src/detect/experimental/immediate_children.rs renamed to aderyn_core/tests/immediate_children.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::collapsible_match)]
 use std::{collections::BTreeMap, error::Error};
 
-use crate::{
+use aderyn_core::{
     ast::NodeID,
     capture,
     context::{
@@ -91,14 +91,13 @@ impl IssueDetector for ImmediateParentDemonstrator {
 
 #[cfg(test)]
 mod parent_chain_demo_tests {
-    use crate::detect::{
-        detector::IssueDetector, experimental::immediate_parent::ImmediateParentDemonstrator,
-    };
+    use super::*;
+    use aderyn_core::detect::test_utils::load_solidity_source_unit;
 
     #[test]
 
     fn test_immediate_parent_demo() {
-        let context = crate::detect::test_utils::load_solidity_source_unit(
+        let context = load_solidity_source_unit(
             "../tests/contract-playground/src/parent_chain/ParentChainContract.sol",
         );
 

aderyn_core/src/detect/experimental/immediate_parent.rs renamed to aderyn_core/tests/immediate_parent.rs

@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, error::Error};
 
-use crate::{
+use aderyn_core::{
     ast::NodeID,
     capture,
     context::workspace_context::WorkspaceContext,
@@ -59,16 +59,13 @@ impl IssueDetector for NewASTNodesDemonstrator {
 
 #[cfg(test)]
 mod new_ast_nodes_demonstrator_tests {
-    use crate::detect::{
-        detector::IssueDetector, experimental::new_ast_nodes_test::NewASTNodesDemonstrator,
-    };
+    use super::*;
+    use aderyn_core::detect::test_utils::load_solidity_source_unit;
 
     #[test]
 
     fn test_new_ast_nodes() {
-        let context = crate::detect::test_utils::load_solidity_source_unit(
-            "../tests/adhoc-sol-files/DemoASTNodes.sol",
-        );
+        let context = load_solidity_source_unit("../tests/adhoc-sol-files/DemoASTNodes.sol");
 
         let mut detector = NewASTNodesDemonstrator::default();
         let _ = detector.detect(&context).unwrap();

aderyn_core/src/detect/experimental/new_ast_nodes_test.rs renamed to aderyn_core/tests/new_ast_nodes.rs

@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, error::Error};
 
-use crate::{
+use aderyn_core::{
     ast::NodeID,
     capture,
     context::{browser::PeekOver, workspace_context::WorkspaceContext},
@@ -53,14 +53,14 @@ impl IssueDetector for PeekOverDemonstrator {
 
 #[cfg(test)]
 mod peek_over_demonstrator_tests {
-    use crate::detect::{detector::IssueDetector, experimental::peek_over::PeekOverDemonstrator};
+    use aderyn_core::detect::test_utils::load_solidity_source_unit;
+
+    use super::*;
 
     #[test]
     fn test_peek_over() {
-        let context = crate::detect::test_utils::load_solidity_source_unit(
-            "../tests/contract-playground/src/StorageConditionals.sol",
-        );
-
+        let context =
+            load_solidity_source_unit("../tests/contract-playground/src/StorageConditionals.sol");
         let mut detector = PeekOverDemonstrator::default();
         let _ = detector.detect(&context).unwrap();
 

aderyn_core/src/detect/experimental/peek_over.rs renamed to aderyn_core/tests/peek_over.rs

@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, error::Error};
 
-use crate::{
+use aderyn_core::{
     ast::NodeID,
     capture,
     context::{
@@ -59,14 +59,13 @@ impl IssueDetector for SiblingDemonstrator {
 
 #[cfg(test)]
 mod sibling_demo_tests {
-
-    use crate::detect::{detector::IssueDetector, experimental::sibling::SiblingDemonstrator};
+    use super::*;
+    use aderyn_core::detect::test_utils::load_solidity_source_unit;
 
     #[test]
     fn test_siblings() {
-        let context = crate::detect::test_utils::load_solidity_source_unit(
-            "../tests/contract-playground/src/StorageConditionals.sol",
-        );
+        let context =
+            load_solidity_source_unit("../tests/contract-playground/src/StorageConditionals.sol");
 
         let mut detector = SiblingDemonstrator::default();
         let _ = detector.detect(&context).unwrap();