refactor: we will have multiple antisybil services

backend/app/modules/modules_factory/current.py

@@ -40,7 +40,7 @@
 )
 from app.modules.user.patron_mode.service.events_based import EventsBasedUserPatronMode
 from app.modules.user.tos.service.initial import InitialUserTos, InitialUserTosVerifier
-from app.modules.user.antisybil.service.initial import GitcoinPassportAntisybil
+from app.modules.user.antisybil.service.passport import GitcoinPassportAntisybil
 from app.modules.withdrawals.service.finalized import FinalizedWithdrawals
 from app.pydantic import Model
 from app.shared.blockchain_types import compare_blockchain_types, ChainTypes
@@ -55,7 +55,7 @@ class CurrentServices(Model):
     user_allocations_nonce_service: UserAllocationNonceProtocol
     user_deposits_service: CurrentUserDeposits
     user_tos_service: UserTos
-    user_antisybil_service: GitcoinPassportAntisybil
+    user_antisybil_passport_service: GitcoinPassportAntisybil
     octant_rewards_service: OctantRewards
     history_service: HistoryService
     simulated_pending_snapshot_service: SimulatePendingSnapshots
@@ -97,7 +97,7 @@ def create(chain_id: int) -> "CurrentServices":
         user_allocations = SavedUserAllocations()
         user_allocations_nonce = SavedUserAllocationsNonce()
         user_withdrawals = FinalizedWithdrawals()
-        user_antisybil_service = GitcoinPassportAntisybil()
+        user_antisybil_passport_service = GitcoinPassportAntisybil()
         tos_verifier = InitialUserTosVerifier()
         user_tos = InitialUserTos(verifier=tos_verifier)
         patron_donations = EventsBasedUserPatronMode()
@@ -111,7 +111,7 @@ def create(chain_id: int) -> "CurrentServices":
         score_delegation_verifier = SimpleObfuscationDelegationVerifier()
         score_delegation = SimpleObfuscationDelegation(
             verifier=score_delegation_verifier,
-            antisybil=user_antisybil_service,
+            antisybil=user_antisybil_passport_service,
             user_deposits_service=user_deposits,
         )
 
@@ -142,7 +142,7 @@ def create(chain_id: int) -> "CurrentServices":
             simulated_pending_snapshot_service=simulated_pending_snapshot_service,
             multisig_signatures_service=multisig_signatures,
             user_tos_service=user_tos,
-            user_antisybil_service=user_antisybil_service,
+            user_antisybil_passport_service=user_antisybil_passport_service,
             projects_metadata_service=StaticProjectsMetadataService(),
             user_budgets_service=user_budgets,
             score_delegation_service=score_delegation,

backend/app/modules/modules_factory/pending.py

@@ -38,7 +38,7 @@
     PendingUserAllocations,
     PendingUserAllocationsVerifier,
 )
-from app.modules.user.antisybil.service.initial import (
+from app.modules.user.antisybil.service.passport import (
     GitcoinPassportAntisybil,
 )
 from app.modules.user.budgets.service.saved import SavedUserBudgets

backend/app/modules/user/antisybil/controller.py

@@ -8,13 +8,13 @@
 
 def get_user_antisybil_status(user_address: str) -> Tuple[int, datetime]:
     context = state_context(EpochState.CURRENT)
-    service = get_services(context.epoch_state).user_antisybil_service
+    service = get_services(context.epoch_state).user_antisybil_passport_service
     return service.get_antisybil_status(context, user_address)
 
 
 def update_user_antisybil_status(user_address: str) -> Tuple[int, datetime]:
     context = state_context(EpochState.CURRENT)
-    service = get_services(context.epoch_state).user_antisybil_service
+    service = get_services(context.epoch_state).user_antisybil_passport_service
 
     score, expires_at, all_stamps = service.fetch_antisybil_status(
         context, user_address

backend/tests/conftest.py

@@ -1158,23 +1158,23 @@ def patch_user_budget(monkeypatch):
 @pytest.fixture(scope="function")
 def patch_gitcoin_passport_issue_address_for_scoring(monkeypatch):
     monkeypatch.setattr(
-        "app.modules.user.antisybil.service.initial.issue_address_for_scoring",
+        "app.modules.user.antisybil.service.passport.issue_address_for_scoring",
         mock_gitcoin_passport_issue_address_for_scoring,
     )
 
 
 @pytest.fixture(scope="function")
 def patch_gitcoin_passport_fetch_score(monkeypatch):
     monkeypatch.setattr(
-        "app.modules.user.antisybil.service.initial.fetch_score",
+        "app.modules.user.antisybil.service.passport.fetch_score",
         mock_gitcoin_passport_fetch_score,
     )
 
 
 @pytest.fixture(scope="function")
 def patch_gitcoin_passport_fetch_stamps(monkeypatch):
     monkeypatch.setattr(
-        "app.modules.user.antisybil.service.initial.fetch_stamps",
+        "app.modules.user.antisybil.service.passport.fetch_stamps",
         mock_gitcoin_passport_fetch_stamps,
     )
 

backend/tests/modules/modules_factory/test_modules_factory.py

@@ -33,7 +33,7 @@
     PendingUserAllocationsVerifier,
 )
 from app.modules.user.allocations.service.saved import SavedUserAllocations
-from app.modules.user.antisybil.service.initial import GitcoinPassportAntisybil
+from app.modules.user.antisybil.service.passport import GitcoinPassportAntisybil
 from app.modules.user.budgets.service.saved import SavedUserBudgets
 from app.modules.user.deposits.service.calculated import CalculatedUserDeposits
 from app.modules.user.deposits.service.contract_balance import (

backend/tests/modules/user/antisybil/test_antisybil.py

@@ -4,7 +4,7 @@
 from app.exceptions import UserNotFound
 from app.infrastructure import database
 from app.modules.common.delegation import get_hashed_addresses
-from app.modules.user.antisybil.service.initial import GitcoinPassportAntisybil
+from app.modules.user.antisybil.service.passport import GitcoinPassportAntisybil
 from tests.helpers.context import get_context