From 9d9fe882b67c99242ad38c60d49f7a8d2a00b5a4 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Mon, 14 Oct 2019 09:58:31 +0900
Subject: [PATCH] Remove unnecessary payable keywords

---
 contracts/staking/contracts/src/ZrxVault.sol              | 4 ++--
 contracts/staking/contracts/src/interfaces/IStructs.sol   | 2 +-
 contracts/staking/contracts/src/interfaces/IZrxVault.sol  | 2 +-
 contracts/staking/contracts/src/stake/MixinStake.sol      | 8 ++++----
 .../contracts/src/staking_pools/MixinStakingPool.sol      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contracts/staking/contracts/src/ZrxVault.sol b/contracts/staking/contracts/src/ZrxVault.sol
index 529a936f64..12b5462f6d 100644
--- a/contracts/staking/contracts/src/ZrxVault.sol
+++ b/contracts/staking/contracts/src/ZrxVault.sol
@@ -35,7 +35,7 @@ contract ZrxVault is
     using LibSafeMath for uint256;
 
     // Address of staking proxy contract
-    address payable public stakingProxyAddress;
+    address public stakingProxyAddress;
 
     // True iff vault has been set to Catastrophic Failure Mode
     bool public isInCatastrophicFailure;
@@ -91,7 +91,7 @@ contract ZrxVault is
     /// @dev Sets the address of the StakingProxy contract.
     /// Note that only the contract owner can call this function.
     /// @param _stakingProxyAddress Address of Staking proxy contract.
-    function setStakingProxy(address payable _stakingProxyAddress)
+    function setStakingProxy(address _stakingProxyAddress)
         external
         onlyAuthorized
     {
diff --git a/contracts/staking/contracts/src/interfaces/IStructs.sol b/contracts/staking/contracts/src/interfaces/IStructs.sol
index ae3bd9d9b7..3b889f2f7b 100644
--- a/contracts/staking/contracts/src/interfaces/IStructs.sol
+++ b/contracts/staking/contracts/src/interfaces/IStructs.sol
@@ -97,7 +97,7 @@ interface IStructs {
     /// @param operator of the pool.
     /// @param operatorShare Fraction of the total balance owned by the operator, in ppm.
     struct Pool {
-        address payable operator;
+        address operator;
         uint32 operatorShare;
     }
 }
diff --git a/contracts/staking/contracts/src/interfaces/IZrxVault.sol b/contracts/staking/contracts/src/interfaces/IZrxVault.sol
index f1528f45ec..0b17be0d11 100644
--- a/contracts/staking/contracts/src/interfaces/IZrxVault.sol
+++ b/contracts/staking/contracts/src/interfaces/IZrxVault.sol
@@ -50,7 +50,7 @@ interface IZrxVault {
     /// @dev Sets the address of the StakingProxy contract.
     /// Note that only the contract staker can call this function.
     /// @param _stakingProxyAddress Address of Staking proxy contract.
-    function setStakingProxy(address payable _stakingProxyAddress)
+    function setStakingProxy(address _stakingProxyAddress)
         external;
 
     /// @dev Vault enters into Catastrophic Failure Mode.
diff --git a/contracts/staking/contracts/src/stake/MixinStake.sol b/contracts/staking/contracts/src/stake/MixinStake.sol
index 08ead69be2..415792238e 100644
--- a/contracts/staking/contracts/src/stake/MixinStake.sol
+++ b/contracts/staking/contracts/src/stake/MixinStake.sol
@@ -35,7 +35,7 @@ contract MixinStake is
     function stake(uint256 amount)
         external
     {
-        address payable staker = msg.sender;
+        address staker = msg.sender;
 
         // deposit equivalent amount of ZRX into vault
         getZrxVault().depositFrom(staker, amount);
@@ -109,7 +109,7 @@ contract MixinStake is
     )
         external
     {
-        address payable staker = msg.sender;
+        address staker = msg.sender;
 
         // handle delegation
         if (from.status == IStructs.StakeStatus.DELEGATED) {
@@ -154,7 +154,7 @@ contract MixinStake is
     /// @param amount Amount of stake to delegate.
     function _delegateStake(
         bytes32 poolId,
-        address payable staker,
+        address staker,
         uint256 amount
     )
         private
@@ -192,7 +192,7 @@ contract MixinStake is
     /// @param amount Amount of stake to un-delegate.
     function _undelegateStake(
         bytes32 poolId,
-        address payable staker,
+        address staker,
         uint256 amount
     )
         private
diff --git a/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol b/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol
index ca1832bbab..8869c00c64 100644
--- a/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol
+++ b/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol
@@ -51,7 +51,7 @@ contract MixinStakingPool is
         returns (bytes32 poolId)
     {
         // note that an operator must be payable
-        address payable operator = msg.sender;
+        address operator = msg.sender;
 
         // compute unique id for this pool
         poolId = lastPoolId = bytes32(uint256(lastPoolId).safeAdd(1));