change return type of getSimpleACL

Author: d10r

packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol

@@ -18,6 +18,7 @@ import {
 /// Note: CustomSuperTokenBase is not included for people building CustomSuperToken.
 import { IERC20, IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import { IERC777 } from "@openzeppelin/contracts/token/ERC777/IERC777.sol";
+import { IAccessControl } from "@openzeppelin/contracts/access/IAccessControl.sol";
 import { ISuperfluidToken } from "./ISuperfluidToken.sol";
 import { ISuperToken } from "./ISuperToken.sol";
 import { ISuperTokenFactory } from "./ISuperTokenFactory.sol";
@@ -29,10 +30,10 @@ import { IPoolMemberNFT } from "../agreements/gdav1/IPoolMemberNFT.sol";
 import { ISuperAgreement } from "./ISuperAgreement.sol";
 import { IConstantFlowAgreementV1 } from "../agreements/IConstantFlowAgreementV1.sol";
 import { IInstantDistributionAgreementV1 } from "../agreements/IInstantDistributionAgreementV1.sol";
-import { 
-    IGeneralDistributionAgreementV1, 
-    PoolConfig, 
-    PoolERC20Metadata 
+import {
+    IGeneralDistributionAgreementV1,
+    PoolConfig,
+    PoolERC20Metadata
 } from "../agreements/gdav1/IGeneralDistributionAgreementV1.sol";
 import { ISuperfluidPool } from "../agreements/gdav1/ISuperfluidPool.sol";
 /// Superfluid App interfaces:
@@ -660,17 +661,16 @@ interface ISuperfluid {
 
     // solhint-disable max-line-length
     /**
-     * @dev returns the address of the SimpleACL contract (currently used for SuperApp registration permissioning).
+     * @dev returns the SimpleACL contract (currently used for SuperApp registration permissioning).
      * That contract implements the interface [IAccessControl](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl),
      * which provides the following functions:
      * - [hasRole(role, account)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-hasRole-bytes32-address-)
      * - [getRoleAdmin(role)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-getRoleAdmin-bytes32-)
      * - [grantRole(role, account)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-grantRole-bytes32-address-)
      * - [revokeRole(role, account)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-revokeRole-bytes32-address-)
      * - [renounceRole(role, account)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-renounceRole-bytes32-address-)
-     * @return address of the SimpleACL contract
      */
-    function getSimpleACL() external view returns(address);
+    function getSimpleACL() external view returns(IAccessControl);
 
     /**************************************************************************
      * Function modifiers for access control and parameter validations

packages/ethereum-contracts/contracts/superfluid/Superfluid.sol

@@ -16,7 +16,8 @@ import {
     SuperfluidGovernanceConfigs,
     ISuperfluidToken,
     ISuperToken,
-    ISuperTokenFactory
+    ISuperTokenFactory,
+    IAccessControl
 } from "../interfaces/superfluid/ISuperfluid.sol";
 import { GeneralDistributionAgreementV1 } from "../agreements/gdav1/GeneralDistributionAgreementV1.sol";
 import { SuperfluidUpgradeableBeacon } from "../upgradability/SuperfluidUpgradeableBeacon.sol";
@@ -974,8 +975,8 @@ contract Superfluid is
         return address(_ERC2771_FORWARDER);
     }
 
-    function getSimpleACL() external view override returns(address) {
-        return address(_SIMPLE_ACL);
+    function getSimpleACL() external view override returns(IAccessControl) {
+        return _SIMPLE_ACL;
     }
 
     /**************************************************************************