Merges pull request #4 v3.5.0

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

2 files changed, 3 insertions, 7 deletions

diff --git a/tests/models/gr/test_business.py b/tests/models/gr/test_business.py
index e38850d..8de2a47 100644
--- a/tests/models/gr/test_business.py
+++ b/tests/models/gr/test_business.py
@@ -11,11 +11,6 @@ from uuid import uuid4
 import pandas as pd
 import pytest
 from dask.distributed import Client as DaskClient
-
-# noinspection PyUnresolvedReferences
-from distributed.utils_test import (
-    client_no_amm,
-)
 from pytest import approx
 
 from generalresearch.currency import USDCent
@@ -699,6 +694,7 @@ class TestBusinessBalance:
         pop_ledger_merge: PopLedgerMerge,
         adj_to_fail_with_tx_factory: Callable[..., None],
         delete_df_collection: Callable[..., None],
+        client_no_amm: DaskClient,
     ):
         """
         - Product 1 $2.50 Complete
diff --git a/tests/models/gr/test_team.py b/tests/models/gr/test_team.py
index e853817..7c93209 100644
--- a/tests/models/gr/test_team.py
+++ b/tests/models/gr/test_team.py
@@ -107,7 +107,7 @@ class TestTeam:
         self,
         gr_team: Team,
         gr_business: Business,
-        team_manager: TeamManager,
+        gr_team_manager: TeamManager,
         gr_business_manager: BusinessManager,
     ):
 
@@ -117,7 +117,7 @@ class TestTeam:
         assert isinstance(gr_team.businesses, list)
         assert len(gr_team.businesses) == 0
 
-        team_manager.add_business(team=gr_team, business=gr_business)
+        gr_team_manager.add_business(team=gr_team, business=gr_business)
         assert len(gr_team.businesses) == 0
         gr_team.prefetch_businesses(gr_business_manager=gr_business_manager)
         assert len(gr_team.businesses) == 1