test: fix tests

_setup/StrategyResolver.py

@@ -70,7 +70,7 @@ def confirm_harvest(self, before, after, tx):
                 "bOxSolid", "strategist"
             )
 
-        assert event["token"] == self.manager.strategy.bBveOxd_Oxd()
+        assert event["token"] == self.manager.strategy.bOxSolid()
         assert event["amount"] == after.balances(
             "bOxSolid", "badgerTree"
         ) - before.balances("bOxSolid", "badgerTree")

_setup/config.py

@@ -2,7 +2,7 @@
 WANT = "0x6519546433dCB0a34A0De908e1032c46906EF664"
 
 ## Account that has a lot of want (we will "borrow it" for testing)
-WHALE_ADDRESS = "0x53D8EDF6a54239eB785eC72213919Fb6b6B73598"
+WHALE_ADDRESS = "0x6e070e66f65ced97439a60c1e775ca41f12ea155"
 
 ## Address for Badger Registry, used to fill in default addresses
 ## See: https://github.com/Badger-Finance/badger-registry

tests/conftest.py

@@ -171,10 +171,6 @@ def deployed(
 
     vault.setStrategy(strategy, {"from": governance})
 
-    # Fastforward a few hours for emissions to kick in
-    chain.sleep(3600 * 24) # 1 day
-    chain.mine(50)
-
     return DotMap(
         deployer=deployer,
         vault=vault,

tests/functional/test_are_you_trying.py

@@ -34,7 +34,8 @@ def test_are_you_trying(deployer, vault, strategy, want, governance):
     # Confirm that userProxy has been generated after first deposit
     assert strategy.getUserProxy() != AddressZero
 
-    chain.sleep(10000 * 13)  # Mine so we get some interest
+    chain.sleep(100000 * 13)  # Mine so we get some interest
+    chain.mine(1)  # Mine so we get some interest
 
     ## TEST 1: Does the want get used in any way?
     assert want.balanceOf(vault) == depositAmount - available
@@ -48,6 +49,11 @@ def test_are_you_trying(deployer, vault, strategy, want, governance):
     # Use this if it should invest all
     assert want.balanceOf(strategy) == 0
 
+    # Check that rewards have been earned
+    # stakingContract = interface.IMultiRewards(strategy.stakingAddress())
+    print("Ratio:", strategy.getSolidlyPoolRatio(strategy.OXD(), strategy.BVEOXD(), False))
+    print("Earned:", strategy.balanceOfRewards())
+
     ## TEST 2: Is the Harvest profitable?
     harvest = strategy.harvest({"from": governance})
     event = harvest.events["Harvested"]

tests/functional/test_does_it_print.py

@@ -30,7 +30,7 @@ def test_is_profitable(vault, strategy, want, randomUser, deployer):
 
     snap.settEarn({"from": settKeeper})
 
-    chain.sleep(15)
+    chain.sleep(15000)
     chain.mine(1)
 
     strategy.harvest({"from": settKeeper})
@@ -66,6 +66,9 @@ def test_is_acceptable_apr(vault, strategy, want, keeper, deployer):
     # Earn
     snap.settEarn({"from": keeper})
 
+    chain.sleep(15000)
+    chain.mine(1)
+
     # Harvest
     strategy.harvest({"from": keeper})
 

tests/integration/test_strategy_permissions.py

@@ -85,7 +85,9 @@ def test_strategy_action_permissions(deployer, vault, strategy, want, keeper):
     # withdrawToVault onlyVault
     for actor in actorsToCheck:
         if actor == strategy.governance() or actor == strategy.strategist():
+            chain.snapshot()
             vault.withdrawToVault({"from": actor})
+            chain.revert()
         else:
             with brownie.reverts("onlyGovernanceOrStrategist"):
                 vault.withdrawToVault({"from": actor})
@@ -98,7 +100,9 @@ def test_strategy_action_permissions(deployer, vault, strategy, want, keeper):
     # withdrawOther _onlyNotProtectedTokens
     for actor in actorsToCheck:
         if actor == strategy.governance() or actor == strategy.strategist():
+            chain.snapshot()
             vault.sweepExtraToken(vault, {"from": actor})
+            chain.revert()
         else:
             with brownie.reverts("onlyGovernanceOrStrategist"):
                 vault.sweepExtraToken(vault, {"from": actor})