refactor: use

Author: 0xClandestine

src/BLSApkRegistry.sol

@@ -39,7 +39,7 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
         _processQuorumApkUpdate(quorumNumbers, pubkey);
 
         // Return pubkeyHash, which will become the operator's unique id
-        emit OperatorAddedToQuorums(operator, operatorToPubkeyHash[operator], quorumNumbers);
+        emit OperatorAddedToQuorums(operator, getOperatorId(operator), quorumNumbers);
     }
 
     /// @inheritdoc IBLSApkRegistry
@@ -52,7 +52,7 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
 
         // Update each quorum's aggregate pubkey
         _processQuorumApkUpdate(quorumNumbers, pubkey.negate());
-        emit OperatorRemovedFromQuorums(operator, operatorToPubkeyHash[operator], quorumNumbers);
+        emit OperatorRemovedFromQuorums(operator, getOperatorId(operator), quorumNumbers);
     }
 
     /// @inheritdoc IBLSApkRegistry
@@ -78,7 +78,7 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
     ) external onlyRegistryCoordinator returns (bytes32 operatorId) {
         bytes32 pubkeyHash = BN254.hashG1Point(params.pubkeyG1);
         require(pubkeyHash != ZERO_PK_HASH, ZeroPubKey());
-        require(operatorToPubkeyHash[operator] == bytes32(0), OperatorAlreadyRegistered());
+        require(getOperatorId(operator) == bytes32(0), OperatorAlreadyRegistered());
         require(pubkeyHashToOperator[pubkeyHash] == address(0), BLSPubkeyAlreadyRegistered());
 
         // gamma = h(sigma, P, P', H(m))
@@ -167,7 +167,7 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
         address operator
     ) public view returns (BN254.G1Point memory, bytes32) {
         BN254.G1Point memory pubkey = operatorToPubkey[operator];
-        bytes32 pubkeyHash = operatorToPubkeyHash[operator];
+        bytes32 pubkeyHash = getOperatorId(operator);
 
         require(pubkeyHash != bytes32(0), OperatorNotRegistered());