test: simplify fixtures

Author: AlbertoCentonze

tests/conftest.py

@@ -6,8 +6,9 @@
 from hypothesis import settings
 from tests.utils.deploy import Protocol
 from tests.utils.deployers import (
-    ERC20_MOCK_DEPLOYER, 
-    DUMMY_PRICE_ORACLE_DEPLOYER
+    ERC20_MOCK_DEPLOYER,
+    CONSTANT_MONETARY_POLICY_DEPLOYER,
+    CONSTANT_MONETARY_POLICY_LENDING_DEPLOYER,
 )
 
 
@@ -42,6 +43,40 @@ def factory(proto):
 def stablecoin(proto):
     return proto.crvUSD
 
+@pytest.fixture(scope="module")
+def collateral_token():
+    # TODO hook decimals fixture
+    return ERC20_MOCK_DEPLOYER.deploy(18)
+
+
+@pytest.fixture(scope="module")
+def borrowed_token(stablecoin):
+    """Default borrowed token for lending tests (crvUSD).
+    Specific test modules can override this if needed.
+    """
+    # TODO should parametrize to use other tokens
+    return stablecoin
+
+
+@pytest.fixture(scope="module")
+def lending_mpolicy_deployer():
+    """Default monetary policy deployer for lending markets: Constant policy.
+    Tests can override to use a different lending policy.
+    """
+    return CONSTANT_MONETARY_POLICY_LENDING_DEPLOYER
+
+
+@pytest.fixture(scope="module")
+def monetary_policy(market_type, controller):
+    """Monetary policy contract for the current market.
+    Test modules can override by replacing the policy on the controller.
+    """
+    if market_type == "lending":
+        # TODO make both controllers use the same policy through a constructor adapter
+        return CONSTANT_MONETARY_POLICY_LENDING_DEPLOYER.at(controller.monetary_policy())
+    else:
+        return CONSTANT_MONETARY_POLICY_DEPLOYER.at(controller.monetary_policy())
+
 
 @pytest.fixture(scope="module")
 def price_oracle(proto):
@@ -73,6 +108,123 @@ def mpolicy_impl(proto):
     return proto.blueprints.mpolicy
 
 
+@pytest.fixture(scope="module", params=["mint", "lending"])
+def market_type(request):
+    return request.param
+
+
+@pytest.fixture(scope="module")
+def amm_A():
+    return 1000
+
+
+@pytest.fixture(scope="module")
+def amm_fee():
+    return 10**16
+
+
+@pytest.fixture(scope="module")
+def loan_discount():
+    return int(0.09 * 10**18)
+
+
+@pytest.fixture(scope="module")
+def liquidation_discount():
+    return int(0.06 * 10**18)
+
+
+@pytest.fixture(scope="module")
+def min_borrow_rate():
+    return 10**15 // (365 * 86400)  # 0.1% APR
+
+
+@pytest.fixture(scope="module")
+def max_borrow_rate():
+    return 10**18 // (365 * 86400)  # 100% APR
+
+
+@pytest.fixture(scope="module")
+def market(
+    market_type,
+    proto,
+    collateral_token,
+    price_oracle,
+    seed_liquidity,
+    borrowed_token,
+    lending_mpolicy_deployer,
+    amm_A,
+    amm_fee,
+    loan_discount,
+    liquidation_discount,
+    min_borrow_rate,
+    max_borrow_rate,
+):
+    if market_type == "mint":
+        return proto.create_mint_market(
+            collateral_token=collateral_token,
+            price_oracle=price_oracle,
+            monetary_policy=proto.mint_monetary_policy,
+            A=amm_A,
+            amm_fee=amm_fee,
+            loan_discount=loan_discount,
+            liquidation_discount=liquidation_discount,
+            debt_ceiling=seed_liquidity,
+        )
+    else:
+        return proto.create_lending_market(
+            borrowed_token=borrowed_token,
+            collateral_token=collateral_token,
+            A=amm_A,
+            fee=amm_fee,
+            loan_discount=loan_discount,
+            liquidation_discount=liquidation_discount,
+            price_oracle=price_oracle,
+            name="Test Vault",
+            min_borrow_rate=min_borrow_rate,
+            max_borrow_rate=max_borrow_rate,
+            seed_amount=seed_liquidity,
+            mpolicy_deployer=lending_mpolicy_deployer,
+        )
+
+
+@pytest.fixture(scope="module")
+def controller(market, market_type, admin, borrow_cap):
+    """Controller for the current market (mint or lending).
+    Sets borrow cap for lending markets to `borrow_cap`.
+    """
+    ctrl = market['controller']
+    if market_type == "lending" and borrow_cap is not None:
+        with boa.env.prank(admin):
+            ctrl.set_borrow_cap(borrow_cap)
+    return ctrl
+
+
+
+
+@pytest.fixture(scope="module")
+def amm(market):
+    """AMM for the current market (mint or lending)."""
+    return market['amm']
+
+
+@pytest.fixture(scope="module")
+def seed_liquidity():
+    """Default liquidity amount used to seed markets at creation time.
+    Override in tests to customize seeding.
+    """
+    return 1000 * 10**18
+
+
+@pytest.fixture(scope="module")
+def borrow_cap(seed_liquidity):
+    """Default borrow cap for lending markets equals `seed_liquidity`.
+    Override to adjust or set to None to skip setting. Ignored for mint.
+    """
+    return seed_liquidity
+
+
+
+
 # ============== Account Fixtures ==============
 
 @pytest.fixture(scope="session")
@@ -96,6 +248,4 @@ def token_mock():
     return ERC20_MOCK_DEPLOYER
 
 
-@pytest.fixture(scope="module")
-def collateral_token():
-    return ERC20_MOCK_DEPLOYER.deploy(18)
+

tests/controller/test_set_price_oracle.py

@@ -13,53 +13,6 @@ def decimals():
     # change behavior with different decimals
     return 18
 
-@pytest.fixture()
-def mint_market(proto, collat):
-    return proto.create_mint_market(
-        collat,
-        proto.price_oracle,
-        proto.mint_monetary_policy,
-        A=1000,
-        amm_fee=10**16,
-        admin_fee=0,
-        loan_discount= int(0.09 * 10**18),
-        liquidation_discount=int(0.06 * 10**18),
-        debt_ceiling=1000 * 10**18
-    )
-
-
-@pytest.fixture()
-def lend_market(proto, collat):
-    return proto.create_lending_market(
-        borrowed_token=proto.crvUSD, # TODO param other tokens
-        collateral_token=collat,
-        A=1000,
-        fee=10**16,
-        loan_discount=int(0.09 * 10**18),
-        liquidation_discount=int(0.06 * 10**18),
-        price_oracle=proto.price_oracle,
-        name="Test Vault",
-        min_borrow_rate=10**15 // (365 * 86400),  # 0.1% APR (per second)
-        max_borrow_rate=10**18 // (365 * 86400)    # 100% APR (per second)
-    )
-
-@pytest.fixture(params=["mint", "lending"])
-def market(request, mint_market, lend_market):
-    """Parametrized fixture that provides both mint and lending markets."""
-    if request.param == "mint":
-        return mint_market
-    else:
-        return lend_market
-
-@pytest.fixture()
-def controller(market):
-    """Parametrized controller fixture that works with both market types."""
-    return market['controller']
-
-@pytest.fixture()
-def amm(market):
-    return market['amm']
-
 
 @pytest.fixture(scope="module")
 def new_oracle(admin):
@@ -203,5 +156,3 @@ def test_same_price_different_oracle(controller, admin, amm):
     # Should succeed even with 0 deviation allowed
     controller.set_price_oracle(same_price_oracle, 0, sender=admin)
     assert amm.price_oracle_contract() == same_price_oracle.address
-
-

tests/lending/conftest.py

@@ -63,9 +63,19 @@ def market_amm(lending_market):
 
 
 @pytest.fixture(scope="module")
-def market_mpolicy(market_controller):
+def monetary_policy(market_controller, borrowed_token, admin):
     from tests.utils.deployers import SEMILOG_MONETARY_POLICY_DEPLOYER
-    return SEMILOG_MONETARY_POLICY_DEPLOYER.at(market_controller.monetary_policy())
+    # Override default policy with Semilog for lending test suite
+    min_borrow_rate = int(0.005 * 1e18) // (365 * 86400)  # 0.5% APR
+    max_borrow_rate = int(0.5 * 1e18) // (365 * 86400)   # 50% APR
+    with boa.env.prank(admin):
+        mp = SEMILOG_MONETARY_POLICY_DEPLOYER.deploy(
+            borrowed_token.address,
+            min_borrow_rate,
+            max_borrow_rate,
+        )
+        market_controller.set_monetary_policy(mp)
+    return mp
 
 
 @pytest.fixture(scope="module")

tests/lending/test_bigfuzz.py

@@ -409,9 +409,9 @@ def rule_change_rate(self, min_rate, max_rate):
         with boa.env.prank(self.admin):
             if min_rate > max_rate or min(min_rate, max_rate) < MIN_RATE or max(min_rate, max_rate) > MAX_RATE:
                 with boa.reverts():
-                    self.market_mpolicy.set_rates(min_rate, max_rate)
+                    self.monetary_policy.set_rates(min_rate, max_rate)
             else:
-                self.market_mpolicy.set_rates(min_rate, max_rate)
+                self.monetary_policy.set_rates(min_rate, max_rate)
 
     @rule(dt=time_shift)
     def time_travel(self, dt):
@@ -430,7 +430,7 @@ def minted_redeemed(self):
 
 
 def test_big_fuzz(
-        vault, borrowed_token, collateral_token, market_mpolicy, accounts, admin, market_amm, market_controller,
+        vault, borrowed_token, collateral_token, monetary_policy, accounts, admin, market_amm, market_controller,
         price_oracle, fake_leverage):
     BigFuzz.TestCase.settings = settings(max_examples=2000, stateful_step_count=20)
     # Or quick check

tests/lending/test_health_in_trades.py

@@ -23,7 +23,7 @@ def __init__(self):
         self.borrowed_mul = 10**(18 - self.borrowed_token.decimals())
         self.collateral_mul = 10**(18 - self.collateral_token.decimals())
         with boa.env.prank(self.admin):
-            self.market_mpolicy.set_rates(int(1e18 * 0.04 / 365 / 86400), int(1e18 * 0.04 / 365 / 86400))
+            self.monetary_policy.set_rates(int(1e18 * 0.04 / 365 / 86400), int(1e18 * 0.04 / 365 / 86400))
         for user in self.accounts[:2]:
             with boa.env.prank(user):
                 self.borrowed_token.approve(self.controller, 2**256 - 1)
@@ -89,7 +89,7 @@ def time_travel(self, t):
     @rule(min_rate=rate, max_rate=rate)
     def change_rate(self, min_rate, max_rate):
         with boa.env.prank(self.admin):
-            self.market_mpolicy.set_rates(min(min_rate, max_rate), max(min_rate, max_rate))
+            self.monetary_policy.set_rates(min(min_rate, max_rate), max(min_rate, max_rate))
 
     @invariant()
     def health(self):
@@ -98,7 +98,7 @@ def health(self):
             assert h > 0
 
 
-def test_adiabatic_follow(market_amm, filled_controller, market_mpolicy, collateral_token, borrowed_token, price_oracle, accounts, admin):
+def test_adiabatic_follow(market_amm, filled_controller, monetary_policy, collateral_token, borrowed_token, price_oracle, accounts, admin):
     AdiabaticTrader.TestCase.settings = settings(max_examples=50, stateful_step_count=50)
     for k, v in locals().items():
         setattr(AdiabaticTrader, k, v)

tests/lending/test_monetary_policy.py

@@ -8,7 +8,7 @@
 
 
 @given(fill=st.floats(min_value=0.0, max_value=2.0))
-def test_monetary_policy(filled_controller, collateral_token, borrowed_token, market_mpolicy, admin, fill):
+def test_monetary_policy(filled_controller, collateral_token, borrowed_token, monetary_policy, admin, fill):
     available = borrowed_token.balanceOf(filled_controller)
     to_borrow = int(fill * available)
     c_amount = 2 * 3000 * to_borrow * 10**(18 - borrowed_token.decimals()) // 10**(18 - collateral_token.decimals())
@@ -23,7 +23,7 @@ def test_monetary_policy(filled_controller, collateral_token, borrowed_token, ma
                 return
             else:
                 filled_controller.create_loan(c_amount, to_borrow, 5)
-                rate = market_mpolicy.rate(filled_controller)
+                rate = monetary_policy.rate(filled_controller)
                 assert rate >= min_default_borrow_rate * (1 - 1e-5)
                 assert rate <= max_default_borrow_rate * (1 + 1e-5)
                 theoretical_rate = min_default_borrow_rate * (max_default_borrow_rate / min_default_borrow_rate)**fill

tests/lending/test_shifted_trades.py

@@ -21,7 +21,7 @@ def trade_to_price(self, p):
         super().trade_to_price(int(p * (1 + self.price_shift)))
 
 
-def test_adiabatic_shifted(market_amm, filled_controller, market_mpolicy, collateral_token, borrowed_token, price_oracle, accounts, admin):
+def test_adiabatic_shifted(market_amm, filled_controller, monetary_policy, collateral_token, borrowed_token, price_oracle, accounts, admin):
     ShiftedTrader.TestCase.settings = settings(max_examples=50, stateful_step_count=50)
     for k, v in locals().items():
         setattr(ShiftedTrader, k, v)

tests/lending/test_st_interest_conservation.py

@@ -204,9 +204,9 @@ def change_rate(self, min_rate, max_rate):
         with boa.env.prank(self.admin):
             if (min_rate > max_rate or min_rate < MIN_RATE or max_rate < MIN_RATE or min_rate > MAX_RATE or max_rate > MAX_RATE):
                 with boa.reverts():
-                    self.market_mpolicy.set_rates(min_rate, max_rate)
+                    self.monetary_policy.set_rates(min_rate, max_rate)
             else:
-                self.market_mpolicy.set_rates(min_rate, max_rate)
+                self.monetary_policy.set_rates(min_rate, max_rate)
 
     @invariant()
     def sum_of_debts(self):
@@ -225,14 +225,14 @@ def debt_payable(self):
             assert debt + 10 >= supply - b  # Can have error of 1 (rounding) at most per step (and 10 stateful steps)
 
 
-def test_stateful_lendborrow(vault, market_amm, market_controller, market_mpolicy, collateral_token, borrowed_token, accounts, admin):
+def test_stateful_lendborrow(vault, market_amm, market_controller, monetary_policy, collateral_token, borrowed_token, accounts, admin):
     StatefulLendBorrow.TestCase.settings = settings(max_examples=200, stateful_step_count=10)
     for k, v in locals().items():
         setattr(StatefulLendBorrow, k, v)
     run_state_machine_as_test(StatefulLendBorrow)
 
 
-def test_borrow_not_reverting(vault, market_amm, market_controller, market_mpolicy, collateral_token, borrowed_token, accounts, admin):
+def test_borrow_not_reverting(vault, market_amm, market_controller, monetary_policy, collateral_token, borrowed_token, accounts, admin):
     for k, v in locals().items():
         setattr(StatefulLendBorrow, k, v)
     state = StatefulLendBorrow()

tests/lending/test_vault.py

@@ -9,11 +9,11 @@
 DEAD_SHARES = 1000
 
 
-def test_vault_creation(vault, market_controller, market_amm, market_mpolicy, factory, price_oracle,
+def test_vault_creation(vault, market_controller, market_amm, monetary_policy, factory, price_oracle,
                         borrowed_token, collateral_token, stablecoin):
     assert vault.amm() == market_amm.address
     assert vault.controller() == market_controller.address
-    assert market_controller.monetary_policy() == market_mpolicy.address
+    assert market_controller.monetary_policy() == monetary_policy.address
     n = factory.market_count()
     assert n > 0
     assert factory.vaults(n - 1) == vault.address
@@ -22,7 +22,7 @@ def test_vault_creation(vault, market_controller, market_amm, market_mpolicy, fa
     assert factory.borrowed_tokens(n - 1) == borrowed_token.address
     assert factory.collateral_tokens(n - 1) == collateral_token.address
     assert factory.price_oracles(n - 1) == price_oracle.address
-    assert factory.monetary_policies(n - 1) == market_mpolicy.address
+    assert factory.monetary_policies(n - 1) == monetary_policy.address
 
     assert factory.vaults(factory.vaults_index(vault.address)) == vault.address