Update OnlyCallableByPoolOperatorOrMakerError params and address PR feedback

contracts/staking/contracts/src/libs/LibStakingRichErrors.sol

@@ -75,9 +75,9 @@ library LibStakingRichErrors {
     bytes4 internal constant INSUFFICIENT_BALANCE_ERROR_SELECTOR =
         0x84c8b7c9;
 
-    // bytes4(keccak256("OnlyCallableByPoolOperatorOrMakerError(address,address)"))
+    // bytes4(keccak256("OnlyCallableByPoolOperatorOrMakerError(address,bytes32)"))
     bytes4 internal constant ONLY_CALLABLE_BY_POOL_OPERATOR_OR_MAKER_ERROR_SELECTOR =
-        0x471c3580;
+        0x7677eb13;
 
     // bytes4(keccak256("MakerPoolAssignmentError(uint8,address,bytes32)"))
     bytes4 internal constant MAKER_POOL_ASSIGNMENT_ERROR_SELECTOR =
@@ -215,7 +215,7 @@ library LibStakingRichErrors {
 
     function OnlyCallableByPoolOperatorOrMakerError(
         address senderAddress,
-        address operator
+        bytes32 poolId
     )
         internal
         pure
@@ -224,7 +224,7 @@ library LibStakingRichErrors {
         return abi.encodeWithSelector(
             ONLY_CALLABLE_BY_POOL_OPERATOR_OR_MAKER_ERROR_SELECTOR,
             senderAddress,
-            operator
+            poolId
         );
     }
 

contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol

@@ -130,7 +130,7 @@ contract MixinStakingPool is
             LibRichErrors.rrevert(LibStakingRichErrors.MakerPoolAssignmentError(
                 LibStakingRichErrors.MakerPoolAssignmentErrorCodes.MakerAddressAlreadyRegistered,
                 makerAddress,
-                getStakingPoolIdOfMaker(makerAddress)
+                poolJoinStatus.poolId
             ));
         }
 
@@ -239,7 +239,7 @@ contract MixinStakingPool is
             LibRichErrors.rrevert(LibStakingRichErrors.MakerPoolAssignmentError(
                 LibStakingRichErrors.MakerPoolAssignmentErrorCodes.MakerAddressAlreadyRegistered,
                 makerAddress,
-                getStakingPoolIdOfMaker(makerAddress)
+                poolJoinStatus.poolId
             ));
         }
 
@@ -352,7 +352,7 @@ contract MixinStakingPool is
             LibRichErrors.rrevert(
                 LibStakingRichErrors.OnlyCallableByPoolOperatorOrMakerError(
                     msg.sender,
-                    operator
+                    poolId
                 )
             );
         }

contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol

@@ -199,7 +199,7 @@ contract MixinStakingPoolRewards is
         }
 
         if (membersReward > 0) {
-            // Increment the balance of the pool
+            // Increase the balance of the pool
             _increasePoolRewards(poolId, membersReward);
 
             // Fetch the last epoch at which we stored an entry for this pool;
@@ -292,7 +292,7 @@ contract MixinStakingPoolRewards is
             return;
         }
 
-        // Decrement the balance of the pool
+        // Decrease the balance of the pool
         _decreasePoolRewards(poolId, balance);
 
         // Withdraw the member's WETH balance