Improved interfaces and tests

src/EmergencyMultisig.sol

@@ -238,7 +238,8 @@ contract EmergencyMultisig is IEmergencyMultisig, PluginUUPSUpgradeable, Proposa
         }
 
         // Register the approval as being made by the owner
-        address _owner = multisigSettings.signerList.getListedOwnerAtBlock(_sender, proposal_.parameters.snapshotBlock);
+        address _owner =
+            multisigSettings.signerList.getListedEncryptionOwnerAtBlock(_sender, proposal_.parameters.snapshotBlock);
         proposal_.approvers[_owner] = true;
 
         // We emit the event as the owner's approval
@@ -294,7 +295,8 @@ contract EmergencyMultisig is IEmergencyMultisig, PluginUUPSUpgradeable, Proposa
     /// @inheritdoc IEmergencyMultisig
     function hasApproved(uint256 _proposalId, address _account) public view returns (bool) {
         Proposal storage proposal_ = proposals[_proposalId];
-        address _owner = multisigSettings.signerList.getListedOwnerAtBlock(_account, proposal_.parameters.snapshotBlock);
+        address _owner =
+            multisigSettings.signerList.getListedEncryptionOwnerAtBlock(_account, proposal_.parameters.snapshotBlock);
 
         return proposals[_proposalId].approvers[_owner];
     }
@@ -356,7 +358,7 @@ contract EmergencyMultisig is IEmergencyMultisig, PluginUUPSUpgradeable, Proposa
         // This internally calls `isListedAtBlock`.
         // If not listed or resolved, it returns address(0)
         (address _resolvedOwner, address _resolvedVoter) =
-            multisigSettings.signerList.resolveAccountAtBlock(_approver, proposal_.parameters.snapshotBlock);
+            multisigSettings.signerList.resolveEncryptionAccountAtBlock(_approver, proposal_.parameters.snapshotBlock);
         if (_resolvedOwner == address(0) || _resolvedVoter == address(0)) {
             // Not listedAtBlock() nor appointed by a listed owner
             return false;

src/Multisig.sol

@@ -242,7 +242,8 @@ contract Multisig is IMultisig, PluginUUPSUpgradeable, ProposalUpgradeable {
         }
 
         // Register the approval as being made by the owner. isListedAtBlock() relates to it
-        address _owner = multisigSettings.signerList.getListedOwnerAtBlock(_sender, proposal_.parameters.snapshotBlock);
+        address _owner =
+            multisigSettings.signerList.getListedEncryptionOwnerAtBlock(_sender, proposal_.parameters.snapshotBlock);
         proposal_.approvers[_owner] = true;
 
         // We emit the event as the owner's approval
@@ -296,7 +297,8 @@ contract Multisig is IMultisig, PluginUUPSUpgradeable, ProposalUpgradeable {
     /// @inheritdoc IMultisig
     function hasApproved(uint256 _proposalId, address _account) public view returns (bool) {
         Proposal storage proposal_ = proposals[_proposalId];
-        address _owner = multisigSettings.signerList.getListedOwnerAtBlock(_account, proposal_.parameters.snapshotBlock);
+        address _owner =
+            multisigSettings.signerList.getListedEncryptionOwnerAtBlock(_account, proposal_.parameters.snapshotBlock);
 
         return proposals[_proposalId].approvers[_owner];
     }
@@ -341,7 +343,7 @@ contract Multisig is IMultisig, PluginUUPSUpgradeable, ProposalUpgradeable {
         // This internally calls `isListedAtBlock`.
         // If not listed or resolved, it returns address(0)
         (address _resolvedOwner, address _resolvedVoter) =
-            multisigSettings.signerList.resolveAccountAtBlock(_approver, proposal_.parameters.snapshotBlock);
+            multisigSettings.signerList.resolveEncryptionAccountAtBlock(_approver, proposal_.parameters.snapshotBlock);
         if (_resolvedOwner == address(0) || _resolvedVoter == address(0)) {
             // Not listedAtBlock() nor appointed by a listed owner
             return false;

src/SignerList.sol

@@ -114,7 +114,11 @@ contract SignerList is ISignerList, Addresslist, ERC165Upgradeable, DaoAuthoriza
     }
 
     /// @inheritdoc ISignerList
-    function getListedOwnerAtBlock(address _address, uint256 _blockNumber) public view returns (address _owner) {
+    function getListedEncryptionOwnerAtBlock(address _address, uint256 _blockNumber)
+        public
+        view
+        returns (address _owner)
+    {
         if (isListedAtBlock(_address, _blockNumber)) {
             return _address;
         }
@@ -127,7 +131,7 @@ contract SignerList is ISignerList, Addresslist, ERC165Upgradeable, DaoAuthoriza
     }
 
     /// @inheritdoc ISignerList
-    function resolveAccountAtBlock(address _address, uint256 _blockNumber)
+    function resolveEncryptionAccountAtBlock(address _address, uint256 _blockNumber)
         public
         view
         returns (address _owner, address _voter)

src/interfaces/ISignerList.sol

@@ -28,12 +28,12 @@ interface ISignerList {
     /// @param sender The address to check within the list of signers or the appointed accounts.
     /// @param blockNumber The block at which the list should be checked
     /// @return owner If resolved to an account, it contains the encryption owner's address. Returns address(0) otherwise.
-    function getListedOwnerAtBlock(address sender, uint256 blockNumber) external returns (address owner);
+    function getListedEncryptionOwnerAtBlock(address sender, uint256 blockNumber) external returns (address owner);
 
     /// @notice Given an address, determines the corresponding (listed) owner account and the appointed wallet, if any.
     /// @return owner If listed and resolved to an account, it contains the encryption owner's address. Returns address(0) otherwise.
     /// @return voter If listed and resolved, it contains the wallet address appointed for decryption, if any. Returns address(0) otherwise.
-    function resolveAccountAtBlock(address sender, uint256 _blockNumber)
+    function resolveEncryptionAccountAtBlock(address sender, uint256 _blockNumber)
         external
         returns (address owner, address voter);