Merges pull request #4 v3.5.0

User Cashout Stuff pulled out of grpc, user ip history enrichments with grip (no maxmind)

1 files changed, 2 insertions, 40 deletions

diff --git a/test_utils/managers/thl/conftest.py b/test_utils/managers/thl/conftest.py
index 3392559..2dce648 100644
--- a/test_utils/managers/thl/conftest.py
+++ b/test_utils/managers/thl/conftest.py
@@ -23,15 +23,10 @@ if TYPE_CHECKING:
     from generalresearch.config import GRLBaseSettings
     from generalresearch.managers.thl.buyer import BuyerManager
     from generalresearch.managers.thl.category import CategoryManager
-    from generalresearch.managers.thl.ipinfo import (
-        IPGeonameManager,
-        IPInformationManager,
-    )
     from generalresearch.managers.thl.payout import (
         BrokerageProductPayoutEventManager,
         BusinessPayoutEventManager,
         PayoutEventManager,
-        UserPayoutEventManager,
     )
     from generalresearch.managers.thl.product import ProductManager
     from generalresearch.managers.thl.session import SessionManager
@@ -45,13 +40,13 @@ if TYPE_CHECKING:
         UserMetadataManager,
     )
     from generalresearch.managers.thl.userhealth import (
-        AuditLogManager,
         IPRecordManager,
     )
     from generalresearch.managers.thl.wall import (
         WallCacheManager,
         WallManager,
     )
+    from generalresearch.managers.thl.wallet.user_payout import UserPayoutEventManager
 
 # === Msc ===
 
@@ -139,7 +134,7 @@ def user_payout_event_manager(
     assert thl_web_rw.dsn.path
     assert "/unittest-" in thl_web_rw.dsn.path
 
-    from generalresearch.managers.thl.payout import UserPayoutEventManager
+    from generalresearch.managers.thl.wallet.user_payout import UserPayoutEventManager
 
     return UserPayoutEventManager(
         pg_config=thl_web_rw,
@@ -166,13 +161,6 @@ def brokerage_product_payout_event_manager(
     )
 
 
-@pytest.fixture()
-def audit_log_manager(thl_web_rw: PostgresConfig) -> AuditLogManager:
-    from generalresearch.managers.thl.userhealth import AuditLogManager
-
-    return AuditLogManager(pg_config=thl_web_rw)
-
-
 @pytest.fixture(scope="session")
 def business_payout_event_manager(
     thl_web_rw: PostgresConfig, thl_redis_config: RedisConfig
@@ -342,32 +330,6 @@ def surveypenalty_manager(thl_redis_config: RedisConfig):
     return SurveyPenaltyManager(redis_config=thl_redis_config)
 
 
-# --- IP Geolocation ---
-
-
-@pytest.fixture
-def ip_geoname_manager(thl_web_rw: PostgresConfig) -> IPGeonameManager:
-    from generalresearch.managers.thl.ipinfo import IPGeonameManager
-
-    return IPGeonameManager(pg_config=thl_web_rw)
-
-
-# --- IP Information ---
-
-
-@pytest.fixture(scope="session")
-def ip_information_manager(thl_web_rw: PostgresConfig) -> IPInformationManager:
-    assert thl_web_rw.dsn.path
-    assert "/unittest-" in thl_web_rw.dsn.path
-
-    from generalresearch.managers.thl.ipinfo import IPInformationManager
-
-    return IPInformationManager(pg_config=thl_web_rw)
-
-
-# --- IP Record ---
-
-
 @pytest.fixture(scope="session")
 def ip_record_manager(
     thl_web_rw: PostgresConfig, thl_redis_config: RedisConfig