Merge pull request #2668 from crytic/dev_update_entry_points_printer

Dev update entry points printer

Author: smonicas

slither/printers/summary/entry_points.py

@@ -2,11 +2,13 @@
 Module printing all the state-changing entry point functions of the contracts
 """
 
+from pathlib import Path
 from slither.printers.abstract_printer import AbstractPrinter
 from slither.core.declarations.function_contract import FunctionContract
 from slither.utils.colors import Colors
 from slither.utils.output import Output
 from slither.utils.myprettytable import MyPrettyTable
+from slither.utils.tests_pattern import is_test_file
 
 
 class PrinterEntryPoints(AbstractPrinter):
@@ -27,15 +29,13 @@ def output(self, _filename) -> Output:
         for contract in sorted(
             (
                 c
-                for c in self.contracts
-                if not c.is_interface
+                for c in self.slither.contracts_derived
+                if not c.is_test
+                and not c.is_from_dependency()
+                and not is_test_file(Path(c.source_mapping.filename.absolute))
+                and not c.is_interface
                 and not c.is_library
                 and not c.is_abstract
-                and "lib/" not in c.source_mapping.filename.absolute
-                and "node_modules/" not in c.source_mapping.filename.absolute
-                and not any(
-                    mock in c.source_mapping.filename.absolute.lower() for mock in ["mock", "mocks"]
-                )
             ),
             key=lambda x: x.name,
         ):
@@ -48,8 +48,6 @@ def output(self, _filename) -> Output:
                     and not f.is_constructor
                     and not f.view
                     and not f.pure
-                    and not f.contract_declarer.is_interface
-                    and not f.contract_declarer.is_library
                     and not f.is_shadowed
                 )
             ]
@@ -65,29 +63,27 @@ def output(self, _filename) -> Output:
 
             for f in sorted(
                 entry_points,
-                key=lambda x: (x.visibility != "external", x.visibility != "public", x.full_name),
+                key=lambda x, contract=contract: (
+                    x.contract_declarer != contract,
+                    x.contract_declarer.name if x.contract_declarer != contract else "",
+                    x.source_mapping.start,
+                ),
             ):
-                modifier_list = [m.name for m in f.modifiers]
-                if f.payable:
-                    modifier_list.append("payable")
-                modifiers = ", ".join(modifier_list) if modifier_list else ""
-                inherited = f"{f.contract_declarer.name}" if f.contract_declarer != contract else ""
-
                 name_parts = f.full_name.split("(", 1)
-                function_name = (
-                    f"{Colors.BOLD}{Colors.RED}{name_parts[0]}{Colors.END}" f"({name_parts[1]}"
+                inherited = f.contract_declarer.name if f.contract_declarer != contract else ""
+                modifiers = ", ".join(
+                    [m.name for m in f.modifiers] + (["payable"] if f.payable else [])
                 )
 
                 table.add_row(
                     [
-                        function_name,
+                        f"{Colors.BOLD}{Colors.RED}{name_parts[0]}{Colors.END}({name_parts[1]}",
                         f"{Colors.GREEN}{modifiers}{Colors.END}" if modifiers else "",
                         f"{Colors.MAGENTA}{inherited}{Colors.END}" if inherited else "",
                     ]
                 )
 
-            contract_info.append(str(table))
-            all_contracts.append("\n".join(contract_info))
+            all_contracts.append("\n".join(contract_info + [str(table)]))
 
         info = "\n".join(all_contracts) if all_contracts else ""
         self.info(info)