ci: fix solhint warnings

aragon · Aug 21, 2024 · 99f5cef · 99f5cef
1 parent 8135b8f
commit 99f5cef
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 1 deletion.
diff --git a/contracts/src/mocks/plugin/CustomExecutorMock.sol b/contracts/src/mocks/plugin/CustomExecutorMock.sol
@@ -26,6 +26,7 @@ contract CustomExecutorMock {
         if (callId == bytes32(0)) {
             revert Failed();
         } else if (callId == bytes32(uint256(123))) {
+            // solhint-disable-next-line reason-string, custom-errors
             revert();
         } else {
             emit Executed(msg.sender, callId, _actions, allowFailureMap, failureMap, execResults);

diff --git a/contracts/src/mocks/plugin/extensions/proposal/ProposalMock.sol b/contracts/src/mocks/plugin/extensions/proposal/ProposalMock.sol
@@ -11,6 +11,7 @@ contract ProposalMock is Proposal {
     // We don't need to test these below functions as they will be tested in the actual plugins.
     // This mock contract is only used to test `supportsInterface` function.
 
+    // solhint-disable no-empty-blocks
     function createProposal(
         bytes memory data,
         IDAO.Action[] memory actions,

diff --git a/contracts/src/mocks/plugin/extensions/proposal/ProposalUpgradeableMock.sol b/contracts/src/mocks/plugin/extensions/proposal/ProposalUpgradeableMock.sol
@@ -11,6 +11,7 @@ contract ProposalUpgradeableMock is ProposalUpgradeable {
     // We don't need to test these below functions as they will be tested in the actual plugins.
     // This mock contract is only used to test `supportsInterface` function.
 
+    // solhint-disable no-empty-blocks
     function createProposal(
         bytes memory data,
         IDAO.Action[] memory actions,

diff --git a/contracts/src/plugin/Plugin.sol b/contracts/src/plugin/Plugin.sol
@@ -134,12 +134,14 @@ abstract contract Plugin is IPlugin, ERC165, DaoAuthorizable, ProtocolVersion {
             bool success;
             bytes memory data;
 
+            // solhint-disable-next-line avoid-low-level-calls
             (success, data) = _target.delegatecall(
                 abi.encodeCall(IDAO.execute, (_callId, _actions, _allowFailureMap))
             );
 
             if (!success) {
                 if (data.length > 0) {
+                    // solhint-disable-next-line no-inline-assembly
                     assembly {
                         let returndata_size := mload(data)
                         revert(add(32, data), returndata_size)

diff --git a/contracts/src/plugin/PluginCloneable.sol b/contracts/src/plugin/PluginCloneable.sol
@@ -149,12 +149,14 @@ abstract contract PluginCloneable is
             bool success;
             bytes memory data;
 
+            // solhint-disable-next-line avoid-low-level-calls
             (success, data) = _target.delegatecall(
                 abi.encodeCall(IDAO.execute, (_callId, _actions, _allowFailureMap))
             );
 
             if (!success) {
                 if (data.length > 0) {
+                    // solhint-disable-next-line no-inline-assembly
                     assembly {
                         let returndata_size := mload(data)
                         revert(add(32, data), returndata_size)

diff --git a/contracts/src/plugin/PluginUUPSUpgradeable.sol b/contracts/src/plugin/PluginUUPSUpgradeable.sol
@@ -164,12 +164,14 @@ abstract contract PluginUUPSUpgradeable is
             bool success;
             bytes memory data;
 
+            // solhint-disable-next-line avoid-low-level-calls
             (success, data) = _target.delegatecall(
                 abi.encodeCall(IDAO.execute, (_callId, _actions, _allowFailureMap))
             );
 
             if (!success) {
                 if (data.length > 0) {
+                    // solhint-disable-next-line no-inline-assembly
                     assembly {
                         let returndata_size := mload(data)
                         revert(add(32, data), returndata_size)

diff --git a/contracts/src/plugin/extensions/proposal/ProposalUpgradeable.sol b/contracts/src/plugin/extensions/proposal/ProposalUpgradeable.sol
@@ -5,7 +5,6 @@ pragma solidity ^0.8.8;
 import {CountersUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/CountersUpgradeable.sol";
 import {ERC165Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
 
-import {IDAO} from "../../../dao/IDAO.sol";
 import {IProposal} from "./IProposal.sol";
 
 /// @title ProposalUpgradeable