fix automerge errors

lidofinance · Jul 25, 2024 · 0f6a0a2 · 0f6a0a2
1 parent 797099a
commit 0f6a0a2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/contracts/libraries/EnumerableProposals.sol b/contracts/libraries/EnumerableProposals.sol
@@ -78,7 +78,7 @@ library EnumerableProposals {
     /// @dev Returns the proposal associated with the given key, reverts if the proposal does not exist
     /// @param map The map to check
     /// @param key The key of the proposal
-    /// @return proposal The proposal associated with the given key
+    /// @return value The proposal associated with the given key
     function get(Bytes32ToProposalMap storage map, bytes32 key) internal view returns (Proposal memory value) {
         if (!contains(map, key)) {
             revert ProposalDoesNotExist(key);

diff --git a/foundry.toml b/foundry.toml
@@ -4,7 +4,7 @@ out = 'out'
 libs = ['node_modules', 'lib']
 test = 'test'
 cache_path  = 'cache_forge'
-solc-version = "0.8.26"
+# solc-version = "0.8.26"
 no-match-path = 'test/kontrol/*'
 
 [profile.kprove]

diff --git a/hardhat.config.js b/hardhat.config.js
diff --git a/test/scenario/proposal-deployment-modes.sol b/test/scenario/proposal-deployment-modes.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity 0.8.26;
 
 import {EmergencyState} from "contracts/libraries/EmergencyProtection.sol";
 import {Proposals} from "contracts/libraries/Proposals.sol";

diff --git a/test/scenario/timelocked-governance.t.sol b/test/scenario/timelocked-governance.t.sol
@@ -97,7 +97,7 @@ contract TimelockedGovernanceScenario is ScenarioTestBlueprint {
             _assertCanExecute(maliciousProposalId, false);
 
             vm.expectRevert(
-                abi.encodeWithSelector(EmergencyProtection.InvalidEmergencyModeActiveValue.selector, true, false)
+                abi.encodeWithSelector(EmergencyProtection.InvalidEmergencyModeStatus.selector, true, false)
             );
             _executeProposal(maliciousProposalId);
         }
@@ -176,7 +176,7 @@ contract TimelockedGovernanceScenario is ScenarioTestBlueprint {
             _assertCanExecute(maliciousProposalId, false);
 
             vm.expectRevert(
-                abi.encodeWithSelector(EmergencyProtection.InvalidEmergencyModeActiveValue.selector, true, false)
+                abi.encodeWithSelector(EmergencyProtection.InvalidEmergencyModeStatus.selector, true, false)
             );
             _executeProposal(maliciousProposalId);
         }