Merge pull request #1513 from bart1e/deterministic-printer-output

Printer outputs sorted
crytic · Dec 20, 2022 · a98a5c4 · a98a5c4
2 parents dbc368f + 8efde31
commit a98a5c4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/slither/printers/functions/authorization.py b/slither/printers/functions/authorization.py
@@ -54,8 +54,8 @@ def output(self, _filename):
                 table.add_row(
                     [
                         function.name,
-                        str(state_variables_written),
-                        str(msg_sender_condition),
+                        str(sorted(state_variables_written)),
+                        str(sorted(msg_sender_condition)),
                     ]
                 )
             all_tables.append((contract.name, table))

diff --git a/slither/printers/summary/data_depenency.py b/slither/printers/summary/data_depenency.py
@@ -42,7 +42,7 @@ def output(self, _filename):
             txt += f"\nContract {c.name}\n"
             table = MyPrettyTable(["Variable", "Dependencies"])
             for v in c.state_variables:
-                table.add_row([v.name, _get(v, c)])
+                table.add_row([v.name, sorted(_get(v, c))])
 
             txt += str(table)
 
@@ -51,9 +51,9 @@ def output(self, _filename):
                 txt += f"\nFunction {f.full_name}\n"
                 table = MyPrettyTable(["Variable", "Dependencies"])
                 for v in f.variables:
-                    table.add_row([v.name, _get(v, f)])
+                    table.add_row([v.name, sorted(_get(v, f))])
                 for v in c.state_variables:
-                    table.add_row([v.canonical_name, _get(v, f)])
+                    table.add_row([v.canonical_name, sorted(_get(v, f))])
                 txt += str(table)
             self.info(txt)
 

diff --git a/slither/printers/summary/function.py b/slither/printers/summary/function.py
@@ -60,15 +60,15 @@ def output(self, _filename):  # pylint: disable=too-many-locals
                 internal_calls,
                 external_calls,
             ) in func_summaries:
-                read = self._convert(read)
-                write = self._convert(write)
-                internal_calls = self._convert(internal_calls)
-                external_calls = self._convert(external_calls)
+                read = self._convert(sorted(read))
+                write = self._convert(sorted(write))
+                internal_calls = self._convert(sorted(internal_calls))
+                external_calls = self._convert(sorted(external_calls))
                 table.add_row(
                     [
                         f_name,
                         visi,
-                        modifiers,
+                        sorted(modifiers),
                         read,
                         write,
                         internal_calls,
@@ -96,10 +96,10 @@ def output(self, _filename):  # pylint: disable=too-many-locals
                 internal_calls,
                 external_calls,
             ) in modif_summaries:
-                read = self._convert(read)
-                write = self._convert(write)
-                internal_calls = self._convert(internal_calls)
-                external_calls = self._convert(external_calls)
+                read = self._convert(sorted(read))
+                write = self._convert(sorted(write))
+                internal_calls = self._convert(sorted(internal_calls))
+                external_calls = self._convert(sorted(external_calls))
                 table.add_row([f_name, visi, read, write, internal_calls, external_calls])
             txt += "\n\n" + str(table)
             txt += "\n"

diff --git a/slither/printers/summary/modifier_calls.py b/slither/printers/summary/modifier_calls.py
@@ -35,7 +35,7 @@ def output(self, _filename):
                 for (_, call) in function.all_library_calls():
                     if isinstance(call, Function):
                         modifiers += call.modifiers
-                table.add_row([function.name, [m.name for m in set(modifiers)]])
+                table.add_row([function.name, sorted([m.name for m in set(modifiers)])])
             txt += "\n" + str(table)
             self.info(txt)
             all_txt += txt

diff --git a/slither/printers/summary/require_calls.py b/slither/printers/summary/require_calls.py
@@ -48,7 +48,7 @@ def output(self, _filename):
                 table.add_row(
                     [
                         function.name,
-                        self._convert([str(m.expression) for m in set(require)]),
+                        self._convert(sorted([str(m.expression) for m in set(require)])),
                     ]
                 )
             txt += "\n" + str(table)