Merge branch 'master' into dev-greg

1 files changed, 46 insertions, 30 deletions

diff --git a/tests/managers/thl/test_cashout_method.py b/tests/managers/thl/test_cashout_method.py
index ee52188..fc364f2 100644
--- a/tests/managers/thl/test_cashout_method.py
+++ b/tests/managers/thl/test_cashout_method.py
@@ -1,62 +1,75 @@
+from __future__ import annotations
+
+from collections.abc import Callable
+from typing import TYPE_CHECKING
+
 import pytest
 
-from generalresearch.models.thl.wallet import PayoutType
 from generalresearch.models.thl.wallet.cashout_method import (
     CashMailCashoutMethodData,
     PaypalCashoutMethodData,
     USDeliveryAddress,
 )
-from test_utils.managers.cashout_methods import (
-    EXAMPLE_TANGO_CASHOUT_METHODS,
-)
+from generalresearch.models.thl.wallet.definitions import PayoutType
+
+if TYPE_CHECKING:
+    from generalresearch.config import GRLBaseSettings
+    from generalresearch.managers.thl.cashout_method import (
+        CashoutMethodManager,
+    )
+    from generalresearch.models.thl.user import User
+    from generalresearch.models.thl.wallet.cashout_method import (
+        CashoutMethod,
+    )
 
 
 class TestTangoCashoutMethods:
 
-    def test_create_and_get(self, cashout_method_manager, setup_cashoutmethod_db):
+    def test_create_and_get(
+        self,
+        cashout_method_manager: CashoutMethodManager,
+        setup_cashoutmethod_db: Callable[..., None],
+        example_tango_cashout_methods: list[CashoutMethod],
+    ):
+        setup_cashoutmethod_db()
+
         res = cashout_method_manager.filter(payout_types=[PayoutType.TANGO])
         assert len(res) == 2
-        cm = [x for x in res if x.ext_id == "U025035"][0]
-        assert EXAMPLE_TANGO_CASHOUT_METHODS[0] == cm
+        cm = next(x for x in res if x.ext_id == "U025035")
+        assert example_tango_cashout_methods[0] == cm
 
     def test_user(
-        self, cashout_method_manager, user_with_wallet, setup_cashoutmethod_db
+        self,
+        cashout_method_manager: CashoutMethodManager,
+        user_with_wallet: User,
+        setup_cashoutmethod_db: Callable[..., None],
     ):
+        setup_cashoutmethod_db()
+
         res = cashout_method_manager.get_cashout_methods(user_with_wallet)
         # This user ONLY has the two tango cashout methods, no AMT
         assert len(res) == 2
 
 
-class TestAMTCashoutMethods:
-
-    def test_create_and_get(self, cashout_method_manager, setup_cashoutmethod_db):
-        res = cashout_method_manager.filter(payout_types=[PayoutType.AMT])
-        assert len(res) == 2
-
-        cm = [x for x in res if x.name == "AMT Assignment"][0]
-        assert AMT_ASSIGNMENT_CASHOUT_METHOD == cm
-
-        cm = [x for x in res if x.name == "AMT Bonus"][0]
-        assert AMT_BONUS_CASHOUT_METHOD == cm
-
-    def test_user(
-        self, cashout_method_manager, user_with_wallet_amt, setup_cashoutmethod_db
-    ):
-        res = cashout_method_manager.get_cashout_methods(user_with_wallet_amt)
-        # This user has the 2 tango, plus amt bonus & assignment
-        assert len(res) == 4
-
 
 class TestUserCashoutMethods:
 
-    def test(self, cashout_method_manager, user_with_wallet, delete_cashoutmethod_db):
+    def test(
+        self,
+        cashout_method_manager: CashoutMethodManager,
+        user_with_wallet: User,
+        delete_cashoutmethod_db: Callable[..., None],
+    ):
         delete_cashoutmethod_db()
 
         res = cashout_method_manager.get_cashout_methods(user_with_wallet)
         assert len(res) == 0
 
     def test_cash_in_mail(
-        self, cashout_method_manager, user_with_wallet, delete_cashoutmethod_db
+        self,
+        cashout_method_manager: CashoutMethodManager,
+        user_with_wallet: User,
+        delete_cashoutmethod_db: Callable[..., None],
     ):
         delete_cashoutmethod_db()
 
@@ -95,7 +108,10 @@ class TestUserCashoutMethods:
         assert len(res) == 2
 
     def test_paypal(
-        self, cashout_method_manager, user_with_wallet, delete_cashoutmethod_db
+        self,
+        cashout_method_manager: CashoutMethodManager,
+        user_with_wallet: User,
+        delete_cashoutmethod_db: Callable[..., None],
     ):
         delete_cashoutmethod_db()