From f8da4c433703d2d451273e71c528332238431de4 Mon Sep 17 00:00:00 2001
From: PatrickAlphaC <54278053+PatrickAlphaC@users.noreply.github.com>
Date: Sat, 14 Sep 2024 22:51:47 -0400
Subject: [PATCH] fix: typecheck

---
 moccasin/commands/test.py |  1 -
 moccasin/fixture_tools.py | 26 ++++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/moccasin/commands/test.py b/moccasin/commands/test.py
index 105a497..6e91365 100644
--- a/moccasin/commands/test.py
+++ b/moccasin/commands/test.py
@@ -7,7 +7,6 @@
 import pytest
 import sys
 from argparse import Namespace
-from _pytest.config import get_config as get_pytest_config
 
 from moccasin.constants.vars import TESTS_FOLDER
 
diff --git a/moccasin/fixture_tools.py b/moccasin/fixture_tools.py
index 4bd047f..eaf7df4 100644
--- a/moccasin/fixture_tools.py
+++ b/moccasin/fixture_tools.py
@@ -1,17 +1,24 @@
 from types import ModuleType
-from typing import Callable
-import pytest
+from typing import Callable, Literal, cast
+from pytest import fixture
 from moccasin.config import get_config
 from boa.contracts.vyper.vyper_contract import VyperContract
 from boa.contracts.abi.abi_contract import ABIContract
 import inspect
 
 
+ScopeType = Literal["function", "class", "module", "package", "session"]
+
+
 def request_fixtures(
     fixture_requests: list[str | tuple[str, str]], scope: str = "module"
 ):
     # Dear Charles, don't kill me. Idk how this works.
-    caller_frame = inspect.currentframe().f_back
+    current_frame = inspect.currentframe()
+    if current_frame is None or current_frame.f_back is None:
+        raise RuntimeError("Cannot determine caller module")
+    caller_frame = current_frame.f_back
+
     caller_module = inspect.getmodule(caller_frame)
     if caller_module is None:
         raise RuntimeError("Cannot determine caller module")
@@ -46,20 +53,19 @@ def deploy_func() -> VyperContract | ABIContract:
         return active_network.get_or_deploy_contract(named_contract_name)
 
     # Create the fixture function
-    fixture = make_fixture(deploy_func, fixture_name, scope)
+    fixture_function = make_fixture(deploy_func, fixture_name, cast(ScopeType, scope))
 
     # Add the fixture to the module's namespace
-    setattr(module, fixture_name, fixture)
+    setattr(module, fixture_name, fixture_function)
 
 
 def make_fixture(
     deploy_func: Callable[[], VyperContract | ABIContract],
     fixture_name: str,
-    scope: str,
+    scope: Literal["function", "class", "module", "package", "session"],
 ) -> Callable[[], VyperContract | ABIContract]:
-    @pytest.fixture(scope=scope)
-    def fixture(deploy_func=deploy_func):
+    @fixture(scope=scope, name=fixture_name)
+    def fixture_func(deploy_func=deploy_func):
         return deploy_func()
 
-    fixture.__name__ = fixture_name
-    return fixture
+    return cast(Callable[[], VyperContract | ABIContract], fixture_func)