From 356735dc5f0715b1bc64414c658dd4417775ee05 Mon Sep 17 00:00:00 2001
From: Gui Heise <gheise@ufl.edu>
Date: Fri, 24 Sep 2021 19:41:38 -0400
Subject: [PATCH] Export order and function updates

---
 mev_inspect/aave_liquidations.py      | 46 ++++++++++-----------------
 mev_inspect/traces.py                 |  4 +--
 tests/test_liquidation_integration.py |  0
 3 files changed, 18 insertions(+), 32 deletions(-)
 create mode 100644 tests/test_liquidation_integration.py

diff --git a/mev_inspect/aave_liquidations.py b/mev_inspect/aave_liquidations.py
index fd49440..4055417 100644
--- a/mev_inspect/aave_liquidations.py
+++ b/mev_inspect/aave_liquidations.py
@@ -3,7 +3,6 @@ from typing import List
 from mev_inspect.traces import (
     get_child_traces,
     is_child_of_any_address,
-    is_child_trace_address,
 )
 from mev_inspect.schemas.classified_traces import (
     ClassifiedTrace,
@@ -27,34 +26,6 @@ AAVE_CONTRACT_ADDRESSES: List[str] = [
 ]
 
 
-def _get_liquidator_payback(
-    child_traces: List[ClassifiedTrace], liquidator: str
-) -> int:
-    for child in child_traces:
-        if child.classification == Classification.transfer:
-
-            child_transfer = ERC20Transfer.from_trace(child)
-
-            if (child_transfer.to_address == liquidator) and (
-                child.from_address in AAVE_CONTRACT_ADDRESSES
-            ):
-                return child_transfer.amount
-
-    return 0
-
-
-def _is_child_of_any_address(
-    trace: ClassifiedTrace, parent_liquidations: List[List[int]]
-) -> bool:
-
-    return any(
-        [
-            is_child_trace_address(trace.trace_address, parent)
-            for parent in parent_liquidations
-        ]
-    )
-
-
 def get_liquidations(
     traces: List[ClassifiedTrace],
 ) -> List[Liquidation]:
@@ -96,5 +67,20 @@ def get_liquidations(
                 )
             )
 
-    print(liquidations)
     return liquidations
+
+
+def _get_liquidator_payback(
+    child_traces: List[ClassifiedTrace], liquidator: str
+) -> int:
+    for child in child_traces:
+        if child.classification == Classification.transfer:
+
+            child_transfer = ERC20Transfer.from_trace(child)
+
+            if (child_transfer.to_address == liquidator) and (
+                child.from_address in AAVE_CONTRACT_ADDRESSES
+            ):
+                return child_transfer.amount
+
+    return 0
diff --git a/mev_inspect/traces.py b/mev_inspect/traces.py
index 842a8c8..f9f6eb4 100644
--- a/mev_inspect/traces.py
+++ b/mev_inspect/traces.py
@@ -35,13 +35,13 @@ def get_child_traces(
 
 
 def is_child_of_any_address(
-    trace: ClassifiedTrace, parent_liquidations: List[List[int]]
+    trace: ClassifiedTrace, parent_trace_addresses: List[List[int]]
 ) -> bool:
 
     return any(
         [
             is_child_trace_address(trace.trace_address, parent)
-            for parent in parent_liquidations
+            for parent in parent_trace_addresses
         ]
     )
 
diff --git a/tests/test_liquidation_integration.py b/tests/test_liquidation_integration.py
new file mode 100644
index 0000000..e69de29