WIP Business tests, fixture cleanup(s)

10 files changed, 116 insertions, 105 deletions

diff --git a/test_utils/conftest.py b/test_utils/conftest.py
index 397d98f..daf6b43 100644
--- a/test_utils/conftest.py
+++ b/test_utils/conftest.py
@@ -342,7 +342,7 @@ def delete_df_collection(
     thl_web_rw: PostgresConfig, create_main_accounts: Callable[..., None]
 ) -> Callable[..., None]:
 
-    from generalresearch.incite.collections import (
+    from generalresearch.incite.collections.base import (
         DFCollection,
         DFCollectionType,
     )
diff --git a/test_utils/incite/collections/conftest.py b/test_utils/incite/collections/conftest.py
index f490e14..499f90b 100644
--- a/test_utils/incite/collections/conftest.py
+++ b/test_utils/incite/collections/conftest.py
@@ -197,7 +197,7 @@ def df_collection(
     utc_90days_ago: datetime,
     thl_web_rr: PostgresConfig,
 ) -> DFCollection:
-    from generalresearch.incite.collections import DFCollection
+    from generalresearch.incite.collections.base import DFCollection
 
     start = utc_90days_ago.replace(microsecond=0)
 
diff --git a/test_utils/incite/conftest.py b/test_utils/incite/conftest.py
index 2968d18..bcf0511 100644
--- a/test_utils/incite/conftest.py
+++ b/test_utils/incite/conftest.py
@@ -16,11 +16,11 @@ from faker import Faker
 if TYPE_CHECKING:
     from generalresearch.config import GRLBaseSettings
     from generalresearch.incite.base import GRLDatasets
-    from generalresearch.incite.collections import (
+    from generalresearch.incite.collections.base import (
         DFCollectionItem,
         DFCollectionType,
     )
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.models.admin.request import (
         ReportRequest,
     )
@@ -131,14 +131,14 @@ def duration() -> timedelta | None:
 
 @pytest.fixture
 def df_collection_data_type() -> DFCollectionType:
-    from generalresearch.incite.collections import DFCollectionType
+    from generalresearch.incite.collections.base import DFCollectionType
 
     return DFCollectionType.TEST
 
 
 @pytest.fixture
 def merge_type() -> MergeType:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
 
     return MergeType.TEST
 
@@ -156,7 +156,7 @@ def incite_item_factory(
         observations: int = 3,
         user: User | None = None,
     ):
-        from generalresearch.incite.collections import (
+        from generalresearch.incite.collections.base import (
             DFCollection,
             DFCollectionType,
         )
diff --git a/test_utils/incite/mergers/conftest.py b/test_utils/incite/mergers/conftest.py
index 4eb3f2d..fb95c81 100644
--- a/test_utils/incite/mergers/conftest.py
+++ b/test_utils/incite/mergers/conftest.py
@@ -58,7 +58,7 @@ def pop_ledger_merge(
     duration: timedelta,
 ) -> PopLedgerMerge:
 
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
 
     return PopLedgerMerge(
@@ -88,7 +88,7 @@ def ym_survey_wall_merge(
     mnt_filepath: GRLDatasets,
     start: datetime,
 ) -> YMSurveyWallMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.ym_survey_wall import YMSurveyWallMerge
 
     return YMSurveyWallMerge(
@@ -119,7 +119,7 @@ def ym_wall_summary_merge(
     duration: timedelta,
     start: datetime,
 ) -> YMWallSummaryMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.ym_wall_summary import YMWallSummaryMerge
 
     return YMWallSummaryMerge(
@@ -155,7 +155,7 @@ def enriched_session_merge(
     duration: timedelta,
     start: datetime,
 ) -> EnrichedSessionMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.enriched_session import (
         EnrichedSessionMerge,
     )
@@ -175,7 +175,7 @@ def enriched_task_adjust_merge(
     duration: timedelta,
     start: datetime,
 ) -> EnrichedTaskAdjustMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
         EnrichedTaskAdjustMerge,
     )
@@ -197,7 +197,7 @@ def enriched_wall_merge(
     duration: timedelta,
     start: datetime,
 ) -> EnrichedWallMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.enriched_wall import (
         EnrichedWallMerge,
     )
@@ -217,7 +217,7 @@ def user_id_product_merge(
     offset: str,
     start: datetime,
 ) -> UserIdProductMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.user_id_product import (
         UserIdProductMerge,
     )
@@ -243,7 +243,7 @@ def merge_collection(
     duration: timedelta,
     start: datetime,
 ):
-    from generalresearch.incite.mergers import MergeCollection
+    from generalresearch.incite.mergers.base import MergeCollection
 
     return MergeCollection(
         merge_type=merge_type,
diff --git a/test_utils/managers/gr/conftest.py b/test_utils/managers/gr/conftest.py
index 5392c69..a7fa9e9 100644
--- a/test_utils/managers/gr/conftest.py
+++ b/test_utils/managers/gr/conftest.py
@@ -9,7 +9,6 @@ import pytest
 import redis
 import redis.asyncio as redis_async
 from pydantic import PostgresDsn
-from redis import Redis
 
 from generalresearch.managers.gr.business import (
     BusinessAddressManager,
@@ -31,33 +30,6 @@ def gr_redis_config_db() -> str:
 
 
 @pytest.fixture(scope="session")
-def gr_redis(settings: GRLBaseSettings) -> Redis:
-    assert "unittest" in str(settings.testing_redis) or "127.0.0.1" in str(
-        settings.testing_redis
-    )
-    return Redis.from_url(
-        url=str(settings.gr_redis),
-        decode_responses=True,
-        socket_timeout=settings.redis_timeout,
-        socket_connect_timeout=settings.redis_timeout,
-    )
-
-
-@pytest.fixture
-def gr_redis_async(settings: GRLBaseSettings) -> redis_async.Redis:
-    assert "unittest" in str(settings.testing_redis) or "127.0.0.1" in str(
-        settings.testing_redis
-    )
-
-    return redis_async.Redis.from_url(
-        str(settings.testing_redis),
-        decode_responses=True,
-        socket_timeout=0.20,
-        socket_connect_timeout=0.20,
-    )
-
-
-@pytest.fixture(scope="session")
 def gr_redis_config(
     settings: GRLBaseSettings, gr_redis_config_db: str
 ) -> Generator[RedisConfig]:
diff --git a/test_utils/managers/thl/conftest.py b/test_utils/managers/thl/conftest.py
index af3fd23..391b74c 100644
--- a/test_utils/managers/thl/conftest.py
+++ b/test_utils/managers/thl/conftest.py
@@ -1,9 +1,12 @@
 from __future__ import annotations
 
-from collections.abc import Callable
+import subprocess
+from collections.abc import Callable, Generator
+from random import randint
 from typing import TYPE_CHECKING
 
 import pytest
+import redis
 from pydantic import PostgresDsn
 
 from generalresearch.managers.base import Permission
@@ -59,14 +62,40 @@ def thl_web_rw(thl_web_rr: PostgresConfig) -> PostgresConfig:
 
 
 @pytest.fixture(scope="session")
-def thl_redis_config(settings: GRLBaseSettings) -> RedisConfig:
-    return RedisConfig(
-        dsn=settings.thl_redis,
+def thl_redis_config_db() -> str:
+    return str(randint(99, 1_023))
+
+
+@pytest.fixture(scope="session")
+def thl_redis_config(
+    settings: GRLBaseSettings, thl_redis_config_db: str
+) -> Generator[RedisConfig]:
+    assert "unittest" in str(settings.testing_redis) or "127.0.0.1" in str(
+        settings.testing_redis
+    )
+
+    uri = f"redis://{settings.testing_redis}/{thl_redis_config_db}"
+
+    res = subprocess.run(
+        ["redis-cli", "-u", uri, "SET", "jenkins_lock", "1", "NX", "EX", "3600"],
+        check=True,
+        text=True,
+        capture_output=True,
+    )
+
+    if res.stdout.strip() != "OK":
+        raise ValueError("Redis already locked... aborting.")
+
+    yield RedisConfig(
+        dsn=uri,
         decode_responses=True,
         socket_timeout=settings.redis_timeout,
         socket_connect_timeout=settings.redis_timeout,
     )
 
+    r = redis.from_url(uri)
+    r.flushdb()
+
 
 @pytest.fixture(scope="session")
 def payout_event_manager(
diff --git a/test_utils/models/conftest.py b/test_utils/models/conftest.py
index 089f2e6..ed4da08 100644
--- a/test_utils/models/conftest.py
+++ b/test_utils/models/conftest.py
@@ -370,7 +370,7 @@ def product_amt_true(
 
 @pytest.fixture
 def bp_payout_factory(
-    thl_lm: ThlLedgerManager,
+    thl_ledger_manager: ThlLedgerManager,
     product_manager: ProductManager,
     business_payout_event_manager: BusinessPayoutEventManager,
 ) -> Callable[..., BrokerageProductPayoutEvent]:
@@ -389,7 +389,7 @@ def bp_payout_factory(
         amount = amount or USDCent(randint(1, 99_99))
 
         return business_payout_event_manager.create_bp_payout_event(
-            thl_ledger_manager=thl_lm,
+            thl_ledger_manager=thl_ledger_manager,
             product=product,
             amount=amount,
             ext_ref_id=ext_ref_id or uuid4().hex,
diff --git a/test_utils/models/contest/conftest.py b/test_utils/models/contest/conftest.py
index 91425dc..18a8e5f 100644
--- a/test_utils/models/contest/conftest.py
+++ b/test_utils/models/contest/conftest.py
@@ -275,24 +275,26 @@ def user_with_money(
     request: Request,
     user_factory: Callable[..., User],
     product_user_wallet_yes: Product,
-    thl_lm: ThlLedgerManager,
+    thl_ledger_manager: ThlLedgerManager,
 ) -> User:
 
     params = getattr(request, "param", {}) or {}
     min_balance = int(params.get("min_balance", USDCent(1_00)))
 
     user: User = user_factory(product=product_user_wallet_yes)
-    wallet = thl_lm.get_account_or_create_user_wallet(user)
-    balance = thl_lm.get_account_balance(wallet)
+    wallet = thl_ledger_manager.get_account_or_create_user_wallet(user)
+    balance = thl_ledger_manager.get_account_balance(wallet)
     todo = min_balance - balance
     if todo > 0:
         # # Put money in user's wallet
-        thl_lm.create_tx_user_bonus(
+        thl_ledger_manager.create_tx_user_bonus(
             user=user,
             ref_uuid=uuid4().hex,
             description="bonus",
             amount=Decimal(todo) / 100,
         )
-        print(f"wallet balance: {thl_lm.get_user_wallet_balance(user=user)}")
+        print(
+            f"wallet balance: {thl_ledger_manager.get_user_wallet_balance(user=user)}"
+        )
 
     return user
diff --git a/test_utils/models/gr/conftest.py b/test_utils/models/gr/conftest.py
index 6c1877a..e493f20 100644
--- a/test_utils/models/gr/conftest.py
+++ b/test_utils/models/gr/conftest.py
@@ -23,8 +23,8 @@ if TYPE_CHECKING:
         Business,
         BusinessAddress,
         BusinessBankAccount,
-        TransferMethod,
     )
+    from generalresearch.models.gr.definitions import TransferMethod
     from generalresearch.models.gr.team import Membership, Team
     from generalresearch.pg_helper import PostgresConfig
     from generalresearch.redis_helper import RedisConfig
diff --git a/test_utils/models/ledger/conftest.py b/test_utils/models/ledger/conftest.py
index 8437c7f..31e5eb4 100644
--- a/test_utils/models/ledger/conftest.py
+++ b/test_utils/models/ledger/conftest.py
@@ -65,7 +65,7 @@ if TYPE_CHECKING:
 
 @pytest.fixture
 def ledger_account(
-    request: Request, lm: LedgerManager, currency: LedgerCurrency
+    request: Request, ledger_manager: LedgerManager, currency: LedgerCurrency
 ) -> LedgerAccount:
     from generalresearch.models.thl.ledger import (
         AccountType,
@@ -87,14 +87,14 @@ def ledger_account(
         account_type=account_type,
         normal_balance=direction,
     )
-    return lm.create_account(account=acct_model)
+    return ledger_manager.create_account(account=acct_model)
 
 
 @pytest.fixture
 def ledger_account_factory(
     request: Request,
-    thl_lm: ThlLedgerManager,
-    lm: LedgerManager,
+    thl_ledger_manager: ThlLedgerManager,
+    ledger_manager: LedgerManager,
     currency: LedgerCurrency,
 ) -> Callable[..., LedgerAccount]:
 
@@ -109,7 +109,7 @@ def ledger_account_factory(
         account_type: AccountType = AccountType.CASH,
         direction: Direction = Direction.CREDIT,
     ) -> LedgerAccount:
-        thl_lm.get_account_or_create_bp_wallet(product=product)
+        thl_ledger_manager.get_account_or_create_bp_wallet(product=product)
         acct_uuid = uuid4().hex
         qn = f"{currency}:{account_type}:{acct_uuid}"
 
@@ -121,14 +121,14 @@ def ledger_account_factory(
             account_type=account_type,
             normal_balance=direction,
         )
-        return lm.create_account(account=acct_model)
+        return ledger_manager.create_account(account=acct_model)
 
     return _inner
 
 
 @pytest.fixture
 def ledger_account_credit(
-    request: Request, lm: LedgerManager, currency: LedgerCurrency
+    request: Request, ledger_manager: LedgerManager, currency: LedgerCurrency
 ) -> LedgerAccount:
     from generalresearch.models.thl.ledger import AccountType, Direction
 
@@ -146,12 +146,12 @@ def ledger_account_credit(
         account_type=account_type,
         normal_balance=Direction.CREDIT,
     )
-    return lm.create_account(account=acct_model)
+    return ledger_manager.create_account(account=acct_model)
 
 
 @pytest.fixture
 def ledger_account_debit(
-    request: Request, lm: LedgerManager, currency: LedgerCurrency
+    request: Request, ledger_manager: LedgerManager, currency: LedgerCurrency
 ) -> LedgerAccount:
     from generalresearch.models.thl.ledger import AccountType, Direction
 
@@ -169,11 +169,11 @@ def ledger_account_debit(
         account_type=account_type,
         normal_balance=Direction.DEBIT,
     )
-    return lm.create_account(account=acct_model)
+    return ledger_manager.create_account(account=acct_model)
 
 
 @pytest.fixture
-def tag(request: Request, lm: LedgerManager) -> str:
+def tag(request: Request) -> str:
     from generalresearch.currency import LedgerCurrency
 
     return (
@@ -194,11 +194,11 @@ def bp_payout_event(
     product: Product,
     usd_cent: USDCent,
     business_payout_event_manager: BusinessPayoutEventManager,
-    thl_lm: ThlLedgerManager,
+    thl_ledger_manager: ThlLedgerManager,
 ) -> BrokerageProductPayoutEvent:
 
     return business_payout_event_manager.create_bp_payout_event(
-        thl_ledger_manager=thl_lm,
+        thl_ledger_manager=thl_ledger_manager,
         product=product,
         amount=usd_cent,
         skip_wallet_balance_check=True,
@@ -209,7 +209,7 @@ def bp_payout_event(
 @pytest.fixture
 def bp_payout_event_factory(
     brokerage_product_payout_event_manager: BrokerageProductPayoutEventManager,
-    thl_lm: ThlLedgerManager,
+    thl_ledger_manager: ThlLedgerManager,
 ) -> Callable[..., BrokerageProductPayoutEvent]:
 
     def _inner(
@@ -217,7 +217,7 @@ def bp_payout_event_factory(
     ) -> BrokerageProductPayoutEvent:
 
         return brokerage_product_payout_event_manager.create_bp_payout_event(
-            thl_ledger_manager=thl_lm,
+            thl_ledger_manager=thl_ledger_manager,
             product=product,
             amount=usd_cent,
             ext_ref_id=ext_ref_id,
@@ -229,10 +229,12 @@ def bp_payout_event_factory(
 
 
 @pytest.fixture
-def currency(lm: LedgerManager) -> LedgerCurrency:
+def currency(ledger_manager: LedgerManager) -> LedgerCurrency:
     # return request.param if hasattr(request, "currency") else LedgerCurrency.TEST
-    assert lm.currency, "LedgerManager must have a currency specified for these tests"
-    return lm.currency
+    assert (
+        ledger_manager.currency
+    ), "LedgerManager must have a currency specified for these tests"
+    return ledger_manager.currency
 
 
 @pytest.fixture
@@ -252,7 +254,7 @@ def ledger_tx(
     tag: str,
     currency: LedgerCurrency,
     tx_metadata: dict[str, str] | None,
-    lm: LedgerManager,
+    ledger_manager: LedgerManager,
 ) -> LedgerTransaction:
     from generalresearch.models.thl.ledger import Direction, LedgerEntry
 
@@ -271,12 +273,12 @@ def ledger_tx(
         ),
     ]
 
-    return lm.create_tx(entries=entries, tag=tag, metadata=tx_metadata)
+    return ledger_manager.create_tx(entries=entries, tag=tag, metadata=tx_metadata)
 
 
 @pytest.fixture
 def create_main_accounts(
-    lm: LedgerManager, currency: LedgerCurrency
+    ledger_manager: LedgerManager, currency: LedgerCurrency
 ) -> Callable[..., None]:
 
     def _inner() -> None:
@@ -291,9 +293,9 @@ def create_main_accounts(
             qualified_name=f"{currency.value}:revenue:task_complete",
             normal_balance=Direction.CREDIT,
             account_type=AccountType.REVENUE,
-            currency=lm.currency,
+            currency=ledger_manager.currency,
         )
-        lm.get_account_or_create(account=account)
+        ledger_manager.get_account_or_create(account=account)
 
         account = LedgerAccount(
             display_name="Operating Cash Account",
@@ -303,7 +305,7 @@ def create_main_accounts(
             currency=currency,
         )
 
-        lm.get_account_or_create(account=account)
+        ledger_manager.get_account_or_create(account=account)
 
     return _inner
 
@@ -327,7 +329,7 @@ def delete_ledger_db(thl_web_rw: PostgresManager) -> Callable[..., None]:
 
 @pytest.fixture
 def wipe_main_accounts(
-    thl_web_rw: PostgresManager, lm: LedgerManager, currency: LedgerCurrency
+    thl_web_rw: PostgresManager, ledger_manager: LedgerManager, currency: LedgerCurrency
 ) -> Callable[..., None]:
 
     def _inner() -> None:
@@ -397,7 +399,9 @@ def wipe_main_accounts(
 
 
 @pytest.fixture
-def account_cash(lm: LedgerManager, currency: LedgerCurrency) -> LedgerAccount:
+def account_cash(
+    ledger_manager: LedgerManager, currency: LedgerCurrency
+) -> LedgerAccount:
     from generalresearch.models.thl.ledger import (
         AccountType,
         Direction,
@@ -411,12 +415,12 @@ def account_cash(lm: LedgerManager, currency: LedgerCurrency) -> LedgerAccount:
         account_type=AccountType.CASH,
         currency=currency,
     )
-    return lm.get_account_or_create(account=account)
+    return ledger_manager.get_account_or_create(account=account)
 
 
 @pytest.fixture
 def account_revenue_task_complete(
-    lm: LedgerManager, currency: LedgerCurrency
+    ledger_manager: LedgerManager, currency: LedgerCurrency
 ) -> LedgerAccount:
     from generalresearch.models.thl.ledger import (
         AccountType,
@@ -431,11 +435,13 @@ def account_revenue_task_complete(
         account_type=AccountType.REVENUE,
         currency=currency,
     )
-    return lm.get_account_or_create(account=account)
+    return ledger_manager.get_account_or_create(account=account)
 
 
 @pytest.fixture
-def account_expense_tango(lm: LedgerManager, currency: LedgerCurrency) -> LedgerAccount:
+def account_expense_tango(
+    ledger_manager: LedgerManager, currency: LedgerCurrency
+) -> LedgerAccount:
     from generalresearch.models.thl.ledger import (
         AccountType,
         Direction,
@@ -449,12 +455,12 @@ def account_expense_tango(lm: LedgerManager, currency: LedgerCurrency) -> Ledger
         account_type=AccountType.EXPENSE,
         currency=currency,
     )
-    return lm.get_account_or_create(account=account)
+    return ledger_manager.get_account_or_create(account=account)
 
 
 @pytest.fixture
 def user_account_user_wallet(
-    lm: LedgerManager, user: User, currency: LedgerCurrency
+    ledger_manager: LedgerManager, user: User, currency: LedgerCurrency
 ) -> LedgerAccount:
     from generalresearch.models.thl.ledger import (
         AccountType,
@@ -471,12 +477,12 @@ def user_account_user_wallet(
         reference_uuid=user.uuid,
         currency=currency,
     )
-    return lm.get_account_or_create(account=account)
+    return ledger_manager.get_account_or_create(account=account)
 
 
 @pytest.fixture
 def product_account_bp_wallet(
-    lm: LedgerManager, product: Product, currency: LedgerCurrency
+    ledger_manager: LedgerManager, product: Product, currency: LedgerCurrency
 ) -> LedgerAccount:
     from generalresearch.models.thl.ledger import (
         AccountType,
@@ -495,13 +501,13 @@ def product_account_bp_wallet(
             "currency": currency,
         }
     )
-    return lm.get_account_or_create(account=account)
+    return ledger_manager.get_account_or_create(account=account)
 
 
 @pytest.fixture
 def setup_accounts(
     product_factory: Callable[..., Product],
-    lm: LedgerManager,
+    ledger_manager: LedgerManager,
     user: User,
     currency: LedgerCurrency,
 ) -> Callable[..., None]:
@@ -524,7 +530,7 @@ def setup_accounts(
             reference_uuid=p1.uuid,
             currency=currency,
         )
-        lm.get_account_or_create(account=account)
+        ledger_manager.get_account_or_create(account=account)
 
         account = LedgerAccount.model_validate(
             {
@@ -537,7 +543,7 @@ def setup_accounts(
                 "currency": currency,
             }
         )
-        lm.get_account_or_create(account=account)
+        ledger_manager.get_account_or_create(account=account)
 
         # BP's wallet, user's wallet, and a revenue from their commissions account.
         p2 = product_factory()
@@ -550,7 +556,7 @@ def setup_accounts(
             reference_uuid=p2.uuid,
             currency=currency,
         )
-        lm.get_account_or_create(account)
+        ledger_manager.get_account_or_create(account)
 
         account = LedgerAccount(
             display_name=f"{p2.name} Wallet",
@@ -561,7 +567,7 @@ def setup_accounts(
             reference_uuid=p2.uuid,
             currency=currency,
         )
-        lm.get_account_or_create(account)
+        ledger_manager.get_account_or_create(account)
 
         account = LedgerAccount(
             display_name=f"{user.uuid} Wallet",
@@ -572,7 +578,7 @@ def setup_accounts(
             reference_uuid=user.uuid,
             currency="test",
         )
-        lm.get_account_or_create(account=account)
+        ledger_manager.get_account_or_create(account=account)
 
     return _inner
 
@@ -583,7 +589,7 @@ def session_with_tx_factory(
     session_manager: SessionManager,
     wall_manager: WallManager,
     utc_hour_ago: datetime,
-    thl_lm: ThlLedgerManager,
+    thl_ledger_manager: ThlLedgerManager,
 ) -> Callable[..., Session]:
 
     from generalresearch.models.thl.session import (
@@ -624,14 +630,16 @@ def session_with_tx_factory(
             status_code_1=status_code_1,
         )
 
-        thl_lm.create_tx_task_complete(
+        thl_ledger_manager.create_tx_task_complete(
             wall=last_wall,
             user=user,
             created=last_wall.finished,
             force=True,
         )
 
-        thl_lm.create_tx_bp_payment(session=s, created=last_wall.finished, force=True)
+        thl_ledger_manager.create_tx_bp_payment(
+            session=s, created=last_wall.finished, force=True
+        )
 
         return s
 
@@ -642,7 +650,7 @@ def session_with_tx_factory(
 def adj_to_fail_with_tx_factory(
     session_manager: SessionManager,
     wall_manager: WallManager,
-    thl_lm: ThlLedgerManager,
+    thl_ledger_manager: ThlLedgerManager,
 ) -> Callable[..., None]:
     from datetime import timedelta
 
@@ -675,7 +683,7 @@ def adj_to_fail_with_tx_factory(
             adjusted_timestamp=created,
         )
 
-        thl_lm.create_tx_task_adjustment(
+        thl_ledger_manager.create_tx_task_adjustment(
             wall=w1,
             user=session.user,
             created=created + timedelta(milliseconds=1),
@@ -684,7 +692,7 @@ def adj_to_fail_with_tx_factory(
         session.wall_events = wall_manager.get_wall_events(session_id=session.id)
         session_manager.adjust_status(session=session)
 
-        thl_lm.create_tx_bp_adjustment(
+        thl_ledger_manager.create_tx_bp_adjustment(
             session=session, created=created + timedelta(milliseconds=2)
         )
 
@@ -695,7 +703,7 @@ def adj_to_fail_with_tx_factory(
 def adj_to_complete_with_tx_factory(
     session_manager: SessionManager,
     wall_manager: WallManager,
-    thl_lm: ThlLedgerManager,
+    thl_ledger_manager: ThlLedgerManager,
 ) -> Callable[..., None]:
     from datetime import timedelta
 
@@ -714,7 +722,7 @@ def adj_to_complete_with_tx_factory(
             adjusted_timestamp=created,
         )
 
-        thl_lm.create_tx_task_adjustment(
+        thl_ledger_manager.create_tx_task_adjustment(
             wall=w1,
             user=session.user,
             created=created + timedelta(milliseconds=1),
@@ -723,7 +731,7 @@ def adj_to_complete_with_tx_factory(
         session.wall_events = wall_manager.get_wall_events(session_id=session.id)
         session_manager.adjust_status(session=session)
 
-        thl_lm.create_tx_bp_adjustment(
+        thl_ledger_manager.create_tx_bp_adjustment(
             session=session, created=created + timedelta(milliseconds=2)
         )