Merge pull request #853 from matter-labs/bf-N05

style: Naming Suggestions
matter-labs · Oct 10, 2024 · 0963893 · 0963893
2 parents 0cd8db2 + 3c6006f
commit 0963893
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/l2-contracts/contracts/ConsensusRegistry.sol b/l2-contracts/contracts/ConsensusRegistry.sol
@@ -147,9 +147,9 @@ contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpg
             return;
         }
 
-        _ensureAttesterSnapshot(node);
+        _snapshotAttesterIfOutdated(node);
         node.attesterLatest.active = false;
-        _ensureValidatorSnapshot(node);
+        _snapshotValidatorIfOutdated(node);
         node.validatorLatest.active = false;
 
         emit NodeDeactivated(_nodeOwner);
@@ -166,9 +166,9 @@ contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpg
             return;
         }
 
-        _ensureAttesterSnapshot(node);
+        _snapshotAttesterIfOutdated(node);
         node.attesterLatest.active = true;
-        _ensureValidatorSnapshot(node);
+        _snapshotValidatorIfOutdated(node);
         node.validatorLatest.active = true;
 
         emit NodeActivated(_nodeOwner);
@@ -185,9 +185,9 @@ contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpg
             return;
         }
 
-        _ensureAttesterSnapshot(node);
+        _snapshotAttesterIfOutdated(node);
         node.attesterLatest.removed = true;
-        _ensureValidatorSnapshot(node);
+        _snapshotValidatorIfOutdated(node);
         node.validatorLatest.removed = true;
 
         emit NodeRemoved(_nodeOwner);
@@ -208,7 +208,7 @@ contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpg
             return;
         }
 
-        _ensureValidatorSnapshot(node);
+        _snapshotValidatorIfOutdated(node);
         node.validatorLatest.weight = _weight;
 
         emit NodeValidatorWeightChanged(_nodeOwner, _weight);
@@ -229,7 +229,7 @@ contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpg
             return;
         }
 
-        _ensureAttesterSnapshot(node);
+        _snapshotAttesterIfOutdated(node);
         node.attesterLatest.weight = _weight;
 
         emit NodeAttesterWeightChanged(_nodeOwner, _weight);
@@ -259,7 +259,7 @@ contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpg
         bytes32 newHash = _hashValidatorPubKey(_pubKey);
         _verifyValidatorPubKeyDoesNotExist(newHash);
         validatorPubKeyHashes[newHash] = true;
-        _ensureValidatorSnapshot(node);
+        _snapshotValidatorIfOutdated(node);
         node.validatorLatest.pubKey = _pubKey;
         node.validatorLatest.proofOfPossession = _pop;
 
@@ -288,7 +288,7 @@ contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpg
         _verifyAttesterPubKeyDoesNotExist(newHash);
         attesterPubKeyHashes[newHash] = true;
 
-        _ensureAttesterSnapshot(node);
+        _snapshotAttesterIfOutdated(node);
         node.attesterLatest.pubKey = _pubKey;
 
         emit NodeAttesterKeyChanged(_nodeOwner, _pubKey);
@@ -409,21 +409,21 @@ contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpg
         emit NodeDeleted(_nodeOwner);
     }
 
-    function _ensureAttesterSnapshot(Node storage _node) private {
+    function _snapshotAttesterIfOutdated(Node storage _node) private {
         if (_node.attesterLastUpdateCommit < attestersCommit) {
             _node.attesterSnapshot = _node.attesterLatest;
             _node.attesterLastUpdateCommit = attestersCommit;
         }
     }
 
-    function _ensureValidatorSnapshot(Node storage _node) private {
+    function _snapshotValidatorIfOutdated(Node storage _node) private {
         if (_node.validatorLastUpdateCommit < validatorsCommit) {
             _node.validatorSnapshot = _node.validatorLatest;
             _node.validatorLastUpdateCommit = validatorsCommit;
         }
     }
 
-    function _isNodeOwnerExists(address _nodeOwner) private view returns (bool) {
+    function _doesNodeOwnerExist(address _nodeOwner) private view returns (bool) {
         BLS12_381PublicKey storage pubKey = nodes[_nodeOwner].validatorLatest.pubKey;
         if (pubKey.a == bytes32(0) && pubKey.b == bytes32(0) && pubKey.c == bytes32(0)) {
             return false;
@@ -432,13 +432,13 @@ contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpg
     }
 
     function _verifyNodeOwnerExists(address _nodeOwner) private view {
-        if (!_isNodeOwnerExists(_nodeOwner)) {
+        if (!_doesNodeOwnerExist(_nodeOwner)) {
             revert NodeOwnerDoesNotExist();
         }
     }
 
     function _verifyNodeOwnerDoesNotExist(address _nodeOwner) private view {
-        if (_isNodeOwnerExists(_nodeOwner)) {
+        if (_doesNodeOwnerExist(_nodeOwner)) {
             revert NodeOwnerExists();
         }
     }