test: fix tests, add gas measure example

Author: heswithme

tests/integration/conftest.py

@@ -21,7 +21,7 @@ def rpc_url():
 
 @pytest.fixture(autouse=True)
 def forked_env(rpc_url):
-    block_to_fork = 20969484
+    block_to_fork = 21020069
     with boa.swap_env(boa.Env()):
         if BOA_CACHE:
             boa.fork(url=rpc_url, block_identifier=block_to_fork)

tests/integration/test_dynamic_weight.py

@@ -33,6 +33,9 @@ def raw_weight() -> uint256:
 def test_fee_splitter_cap(
     fee_splitter, crvusd, vault, rewards_handler, active_controllers, new_depositor, stablecoin_lens
 ):
+    fee_collector_before = crvusd.balanceOf(ab.crvusd_fee_collector)
+    rewards_handler_before = crvusd.balanceOf(rewards_handler.address)
+
     # test were we ask for so much that we hit the cap
     fee_splitter_cap = fee_splitter.receivers(0)[1]
 
@@ -63,8 +66,10 @@ def test_fee_splitter_cap(
     fee_collector_after = crvusd.balanceOf(ab.crvusd_fee_collector)
     rewards_handler_after = crvusd.balanceOf(rewards_handler.address)
 
+    fee_collector_diff = fee_collector_after - fee_collector_before
+    rewards_handler_diff = rewards_handler_after - rewards_handler_before
     # amount received by the rewards_handler was capped at the source
-    assert fee_collector_after / rewards_handler_after == 9_000 / 1_000
+    assert fee_collector_diff / rewards_handler_diff == 9_000 / 1_000
 
 
 def test_minimum_weight(rewards_handler, minimum_weight, vault, crvusd, new_depositor):
@@ -118,10 +123,16 @@ def test_dynamic_weight_depositors(
         # ================= WEIGHTS CHECKS ==================
 
         with boa.env.anchor():
+            fee_collector_before = crvusd.balanceOf(ab.crvusd_fee_collector)
+            rewards_handler_before = crvusd.balanceOf(rewards_handler.address)
+
             fee_splitter.dispatch_fees(active_controllers)
             fee_collector_after = crvusd.balanceOf(ab.crvusd_fee_collector)
             rewards_handler_after = crvusd.balanceOf(rewards_handler.address)
 
+            fee_collector_diff = fee_collector_after - fee_collector_before
+            rewards_handler_diff = rewards_handler_after - rewards_handler_before
+
         if raw_weight < rewards_handler.minimum_weight():
             assert rewards_handler.weight() >= raw_weight
             assert rewards_handler.weight() == rewards_handler.minimum_weight() == minimum_weight
@@ -132,15 +143,15 @@ def test_dynamic_weight_depositors(
             # if the weight is actually dynamic we want to make sure
             # that the distribution is done according to the weight
 
-            balance_ratio = fee_collector_after * 10_000 // rewards_handler_after
+            balance_ratio = fee_collector_diff * 10_000 // rewards_handler_diff
             excess = 1_000 - raw_weight
             weight_ratio = (9_000 + excess) * 10_000 // raw_weight
 
             assert balance_ratio == weight_ratio
 
         elif raw_weight > fee_splitter_cap:
             # amount received by the rewards_handler was capped at the source
-            assert fee_collector_after / rewards_handler_after == 9_000 / 1_000
+            assert fee_collector_diff / rewards_handler_diff == 9_000 / 1_000
 
         else:
             raise AssertionError("This should not happen")

tests/integration/test_fee_splitter.py

@@ -1,10 +1,7 @@
 import boa
 
-import address_book as ab
-
 
 def test_fee_splitter(fee_splitter, rewards_handler, crvusd, vault, active_controllers):
-    assert crvusd.balanceOf(ab.crvusd_fee_collector) == 0
     assert crvusd.balanceOf(rewards_handler.address) == 0
 
     # ============== SOME DEPOSITS JOIN THE VAULT ==============

tests/integration/test_stablecoin_lens.py

@@ -1,6 +1,16 @@
-FORK_BLOCK_SUPPLY = 61914061856509260204722729
+import pytest
+import boa
+
+FORK_BLOCK_SUPPLY = 62247189465433688283786326
 
 
 def test_circulating_supply(stablecoin_lens):
     # circ supply for block of fork
     assert stablecoin_lens.circulating_supply() == FORK_BLOCK_SUPPLY
+
+
+@pytest.mark.ignore_isolation
+def test_gas_cost(stablecoin_lens):
+    boa.env.reset_gas_used()
+    _ = stablecoin_lens.circulating_supply()
+    print(f"Compute TWA gas: {stablecoin_lens.call_trace().gas_used}")

tests/unitary/rewards_handler/test_take_snapshot.py

@@ -2,14 +2,17 @@
 import boa
 
 
-@pytest.mark.gas_profile
-def test_take_snapshot_compute(rewards_handler):
+@pytest.mark.ignore_isolation
+def test_take_snapshot_compute(vault, rewards_handler):
     n_days = 7
-    dt = 600
+    dt = 3600
     snaps_per_day = 86_400 // dt
     for i_day in range(n_days):
         for i_snap in range(snaps_per_day):
             rewards_handler.take_snapshot()
             boa.env.time_travel(seconds=dt)
+        boa.env.reset_gas_used()
         twa = rewards_handler.compute_twa()
+        print(f"Compute TWA gas: {rewards_handler.call_trace().gas_used}")
+        # print(rewards_handler._computation.get_gas_used())
         assert twa >= 0, f"Computed TWA is negative: {twa}"