Merge pull request #286 from bancorprotocol/281-add-test-coverage-arb…

…-modes 281 add test coverage arb modes
bancorprotocol · Jan 8, 2024 · 875a7b5 · 875a7b5
2 parents 2cd306b + 123c7ba
commit 875a7b5
Show file tree

Hide file tree

Showing 13 changed files with 761 additions and 538 deletions.
diff --git a/fastlane_bot/bot.py b/fastlane_bot/bot.py
@@ -75,7 +75,6 @@
 from .events.interface import QueryInterface
 from .modes.pairwise_multi import FindArbitrageMultiPairwise
 from .modes.pairwise_multi_all import FindArbitrageMultiPairwiseAll
-from .modes.pairwise_multi_bal import FindArbitrageMultiPairwiseBalancer
 from .modes.pairwise_multi_pol import FindArbitrageMultiPairwisePol
 from .modes.pairwise_single import FindArbitrageSinglePairwise
 from .modes.triangle_multi import ArbitrageFinderTriangleMulti
@@ -427,8 +426,6 @@ def _get_arb_finder(arb_mode: str) -> Callable:
             return ArbitrageFinderTriangleBancor3TwoHop
         elif arb_mode in {"multi_pairwise_pol"}:
             return FindArbitrageMultiPairwisePol
-        elif arb_mode in {"multi_pairwise_bal"}:
-            return FindArbitrageMultiPairwiseBalancer
         elif arb_mode in {"multi_pairwise_all"}:
             return FindArbitrageMultiPairwiseAll
 

diff --git a/fastlane_bot/modes/pairwise_multi_all.py b/fastlane_bot/modes/pairwise_multi_all.py
@@ -31,7 +31,8 @@ def find_arbitrage(self, candidates: List[Any] = None, ops: Tuple = None, best_p
             candidates = []
 
         all_tokens, combos = self.get_combos(self.CCm, self.flashloan_tokens)
-
+        if self.result == self.AO_TOKENS:
+            return all_tokens, combos
         #print(f"combos = {combos}")
 
         candidates = []

diff --git a/fastlane_bot/modes/pairwise_multi_bal.py b/fastlane_bot/modes/pairwise_multi_bal.py
diff --git a/fastlane_bot/modes/pairwise_multi_pol.py b/fastlane_bot/modes/pairwise_multi_pol.py
@@ -28,6 +28,8 @@ def find_arbitrage(self, candidates: List[Any] = None, ops: Tuple = None, best_p
         """
 
         all_tokens, combos = self.get_combos_pol(self.CCm, self.flashloan_tokens)
+        if self.result == self.AO_TOKENS:
+            return all_tokens, combos
 
         candidates = []
         self.ConfigObj.logger.debug(
@@ -191,7 +193,7 @@ def get_combos_pol(self,
         """
 
         bancor_pol_tkns = CCm.byparams(exchange="bancor_pol").tokens()
-        bancor_pol_tkns = [tkn for tkn in bancor_pol_tkns if tkn not in [T.ETH, T.WETH]]
+        bancor_pol_tkns = set([tkn for tkn in bancor_pol_tkns if tkn not in [T.ETH, T.WETH]])
 
         combos = [
             (tkn0, tkn1)

diff --git a/main.py b/main.py
@@ -95,7 +95,6 @@
             "multi_triangle",
             "b3_two_hop",
             "multi_pairwise_pol",
-            "multi_pairwise_bal",
             "multi_pairwise_all",
         ]
     ),