test(protocol-contracts): fix tests

Author: melanciani

protocol-contracts/staking/contracts/OperatorRewarder.sol

@@ -146,6 +146,8 @@ contract OperatorRewarder is Ownable {
      * @param basisPoints Maximum fee in basis points (max 10000).
      */
     function setMaxfee(uint16 basisPoints) public virtual onlyOwner {
+        require(basisPoints != _maxfeeBasisPoints, MaxFeeAlreadySet(basisPoints, _maxfeeBasisPoints));
+
         _setMaxfee(basisPoints);
     }
 
@@ -155,6 +157,8 @@ contract OperatorRewarder is Ownable {
      * @param basisPoints Fee in basis points (cannot be greater than the maximum fee).
      */
     function setFee(uint16 basisPoints) public virtual onlyBeneficiary {
+        require(basisPoints != feeBasisPoints(), FeeAlreadySet(basisPoints, feeBasisPoints()));
+
         _setFee(basisPoints);
     }
 
@@ -320,7 +324,6 @@ contract OperatorRewarder is Ownable {
      */
     function _setMaxfee(uint16 basisPoints) internal virtual {
         require(basisPoints <= 10000, InvalidBasisPoints(basisPoints));
-        require(basisPoints != _maxfeeBasisPoints, MaxFeeAlreadySet(basisPoints, _maxfeeBasisPoints));
 
         if (basisPoints < _feeBasisPoints) {
             _setFee(basisPoints);
@@ -337,7 +340,6 @@ contract OperatorRewarder is Ownable {
      */
     function _setFee(uint16 basisPoints) internal virtual {
         require(basisPoints <= 10000, InvalidBasisPoints(basisPoints));
-        require(basisPoints != feeBasisPoints(), FeeAlreadySet(basisPoints, feeBasisPoints()));
         require(basisPoints <= _maxfeeBasisPoints, MaxBasisPointsExceeded(basisPoints, _maxfeeBasisPoints));
 
         _claimFee();

protocol-contracts/staking/test/OperatorRewarder.test.ts

@@ -75,6 +75,12 @@ describe('OperatorRewarder', function () {
         .withArgs(ethers.ZeroAddress);
     });
 
+    it('should not transfer beneficiary address to same address', async function () {
+      await expect(this.mock.connect(this.admin).transferBeneficiary(this.beneficiary.address))
+        .to.be.revertedWithCustomError(this.mock, 'BeneficiaryAlreadySet')
+        .withArgs(this.beneficiary.address);
+    });
+
     it('should not transfer beneficiary address if not owner', async function () {
       await expect(this.mock.connect(this.anyone).transferBeneficiary(this.anyone.address))
         .to.be.revertedWithCustomError(this.mock, 'OwnableUnauthorizedAccount')
@@ -333,6 +339,13 @@ describe('OperatorRewarder', function () {
         .to.be.revertedWithCustomError(this.mock, 'InvalidBasisPoints')
         .withArgs(10001);
     });
+
+    it('should revert if max fee already set', async function () {
+      await this.mock.connect(this.admin).setMaxfee(1000);
+      await expect(this.mock.connect(this.admin).setMaxfee(1000))
+        .to.be.revertedWithCustomError(this.mock, 'MaxFeeAlreadySet')
+        .withArgs(1000, 1000);
+    });
   });
 
   describe('setFee', async function () {
@@ -389,6 +402,13 @@ describe('OperatorRewarder', function () {
         .withArgs(10001);
     });
 
+    it('should revert if fee already set', async function () {
+      await this.mock.connect(this.beneficiary).setFee(1000);
+      await expect(this.mock.connect(this.beneficiary).setFee(1000))
+        .to.be.revertedWithCustomError(this.mock, 'FeeAlreadySet')
+        .withArgs(1000, 1000);
+    });
+
     it('should revert if over max fee', async function () {
       await this.mock.connect(this.admin).setMaxfee(1000);
       await expect(this.mock.connect(this.beneficiary).setFee(1234))