Merge pull request #773 from OpenZeppelin/foundry-v1-migration

🔨 fix: foundry v1 breaking changes

Author: xaler5

contracts/test/levels/Impersonator.t.sol

@@ -57,21 +57,24 @@ contract TestImpersonator is Test, Utils {
         assertFalse(submitLevelInstance(ethernaut, address(instance)));
     }
 
-    function testFail_TrySameSignatureOpen() public {
+    function testTrySameSignatureOpen() public {
         vm.startPrank(player);
         ECLocker locker0 = instance.lockers(0);
+        vm.expectRevert();
         locker0.open(v, r, s);
     }
 
-    function testFail_TrySameSignatureChangeController() public {
+    function testTrySameSignatureChangeController() public {
         vm.startPrank(player);
         ECLocker locker0 = instance.lockers(0);
+        vm.expectRevert();
         locker0.changeController(v, r, s, player);
     }
 
-    function testFail_TryRandomSignatureChangeController() public {
+    function testTryRandomSignatureChangeController() public {
         vm.startPrank(player);
         ECLocker locker0 = instance.lockers(0);
+        vm.expectRevert();
         locker0.changeController(28, r, bytes32(uint256(s) + 1), player);
     }
 

contracts/test/levels/MagicAnimalCarousel.t.sol

@@ -75,14 +75,15 @@ contract TestMagicAnimalCarousel is Test, Utils {
         //  assertEq(instance.carousel(3), fishEnc | 0 << 160 | uint160(address(player)));
     }
 
-    function testFailOnlyOwnerShouldBeAbleToChangeAnimal() public {
+    function testNonOwnerShouldNotBeAbleToChangeAnimal() public {
         vm.startPrank(player, player);
         instance.setAnimalAndSpin("Echidna");
         vm.stopPrank();
+        vm.expectRevert();
         instance.changeAnimal("Pidgeon", 1);
     }
 
-    function testOnlyOwnerShouldBeAbleToChangeAnimal() public {
+    function testOwnerShouldBeAbleToChangeAnimal() public {
         vm.startPrank(player, player);
 
         string memory pidgeon = "Pidgeon";