refactor: supportsAVS

Author: 8sunyuan

script/tasks/register_operator_to_operatorSet.s.sol

@@ -18,7 +18,9 @@ contract AVSRegistrar is IAVSRegistrar {
         bytes calldata data
     ) external {}
     function deregisterOperator(address operator, address avsIdentifier, uint32[] calldata operatorSetIds) external {}
-    function avs() external view returns (address) {}
+    function supportsAVS(address /*avs*/) external pure returns (bool) {
+        return true;
+    }
     fallback() external {}
 }
 

src/contracts/core/AllocationManager.sol

@@ -321,7 +321,7 @@ contract AllocationManager is
     function setAVSRegistrar(address avs, IAVSRegistrar registrar) external checkCanCall(avs) {
         // Check that the registrar is correctly configured to prevent an AVSRegistrar contract
         // from being used with the wrong AVS
-        require(registrar.avs() == avs, InvalidAVSRegistrar());
+        require(registrar.supportsAVS(avs), InvalidAVSRegistrar());
         _avsRegistrar[avs] = registrar;
         emit AVSRegistrarSet(avs, getAVSRegistrar(avs));
     }

src/contracts/interfaces/IAVSRegistrar.sol

@@ -7,13 +7,13 @@ interface IAVSRegistrar {
      * for one or more operator sets. This method should revert if registration
      * is unsuccessful.
      * @param operator the registering operator
-     * @param avsIdentifier the AVS the operator is registering for. This should be the same as IAVSRegistrar.avs()
+     * @param avs the AVS the operator is registering for. This should be the same as IAVSRegistrar.avs()
      * @param operatorSetIds the list of operator set ids being registered for
      * @param data arbitrary data the operator can provide as part of registration
      */
     function registerOperator(
         address operator,
-        address avsIdentifier,
+        address avs,
         uint32[] calldata operatorSetIds,
         bytes calldata data
     ) external;
@@ -22,15 +22,15 @@ interface IAVSRegistrar {
      * @notice Called by the AllocationManager when an operator is deregistered from
      * one or more operator sets. If this method reverts, it is ignored.
      * @param operator the deregistering operator
-     * @param avsIdentifier the AVS the operator is deregistering from. This should be the same as IAVSRegistrar.avs()
+     * @param avs the AVS the operator is deregistering from. This should be the same as IAVSRegistrar.avs()
      * @param operatorSetIds the list of operator set ids being deregistered from
      */
-    function deregisterOperator(address operator, address avsIdentifier, uint32[] calldata operatorSetIds) external;
+    function deregisterOperator(address operator, address avs, uint32[] calldata operatorSetIds) external;
 
     /**
-     * @notice Returns the account identifier address of the AVS. This should be the
-     * the same address as the AVS's UAM account identifier address.
-     * @return address of the AVS
+     * @notice Returns true if the AVS is supported by the registrar
+     * @param avs the AVS to check
+     * @return true if the AVS is supported, false otherwise
      */
-    function avs() external view returns (address);
+    function supportsAVS(address avs) external view returns (bool);
 }

src/test/integration/users/AVS.t.sol

@@ -63,8 +63,8 @@ contract AVS is Logger, IAllocationManagerTypes, IAVSRegistrar {
         return _NAME;
     }
 
-    function avs() external view override returns (address) {
-        return address(this);
+    function supportsAVS(address) external pure override returns (bool) {
+        return true;
     }
 
     /// -----------------------------------------------------------------------

src/test/mocks/MockAVSRegistrar.sol

@@ -2,16 +2,10 @@
 pragma solidity ^0.8.27;
 
 contract MockAVSRegistrar {
-    address _avs;
-
-    function avs() external view returns (address) {
-        return _avs;
-    }
-
-    function setAvs(
-        address newAvs
-    ) external {
-        _avs = newAvs;
+    function supportsAVS(
+        address /*avs*/
+    ) external pure returns (bool) {
+        return true;
     }
 
     fallback() external {}

src/test/unit/AllocationManagerUnit.t.sol

@@ -3663,7 +3663,6 @@ contract AllocationManagerUnitTests_setAVSRegistrar is AllocationManagerUnitTest
         Randomness r
     ) public rand(r) {
         address avs = r.Address();
-        MockAVSRegistrar(defaultAVS).setAvs(avs);
         IAVSRegistrar avsRegistrar = IAVSRegistrar(defaultAVS);
 
         cheats.expectEmit(true, true, true, true, address(allocationManager));