From 2d125cdc205fc1a7577128bfc657f3a037d84267 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Tue, 17 Sep 2019 13:50:18 -0700 Subject: [PATCH] Fix typos and remove redundant cached variables --- contracts/staking/contracts/src/stake/MixinZrxVault.sol | 9 +++------ contracts/staking/contracts/src/sys/MixinParams.sol | 2 +- contracts/staking/test/migration.ts | 3 +-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/contracts/staking/contracts/src/stake/MixinZrxVault.sol b/contracts/staking/contracts/src/stake/MixinZrxVault.sol index 1248f0b153..1e8c628d79 100644 --- a/contracts/staking/contracts/src/stake/MixinZrxVault.sol +++ b/contracts/staking/contracts/src/stake/MixinZrxVault.sol @@ -33,8 +33,7 @@ contract MixinZrxVault is function _depositFromOwnerIntoZrxVault(address owner, uint256 amount) internal { - IZrxVault _zrxVault = zrxVault; - _zrxVault.depositFrom(owner, amount); + zrxVault.depositFrom(owner, amount); } /// @dev Withdraws Zrx Tokens from to `owner` from the vault. @@ -43,8 +42,7 @@ contract MixinZrxVault is function _withdrawToOwnerFromZrxVault(address owner, uint256 amount) internal { - IZrxVault _zrxVault = zrxVault; - _zrxVault.withdrawFrom(owner, amount); + zrxVault.withdrawFrom(owner, amount); } /// @dev Returns balance of `owner` in the ZRX ault. @@ -54,7 +52,6 @@ contract MixinZrxVault is view returns (uint256) { - IZrxVault _zrxVault = zrxVault; - return _zrxVault.balanceOf(owner); + return zrxVault.balanceOf(owner); } } diff --git a/contracts/staking/contracts/src/sys/MixinParams.sol b/contracts/staking/contracts/src/sys/MixinParams.sol index 7bb89cfdfe..59cdaa575a 100644 --- a/contracts/staking/contracts/src/sys/MixinParams.sol +++ b/contracts/staking/contracts/src/sys/MixinParams.sol @@ -111,7 +111,7 @@ contract MixinParams is _zrxVaultAddress = address(zrxVault); } - /// @dev Initialzize storage belonging to this mixin. + /// @dev Initialize storage belonging to this mixin. /// @param _wethProxyAddress The address that can transfer WETH for fees. /// @param _ethVaultAddress Address of the EthVault contract. /// @param _rewardVaultAddress Address of the StakingPoolRewardVault contract. diff --git a/contracts/staking/test/migration.ts b/contracts/staking/test/migration.ts index a0c192631a..e8cba2a780 100644 --- a/contracts/staking/test/migration.ts +++ b/contracts/staking/test/migration.ts @@ -89,9 +89,8 @@ blockchainTests('Migration tests', env => { }); it('throws if not called by owner', async () => { - const attachedAddress = randomAddress(); const tx = proxyContract.attachStakingContract.awaitTransactionSuccessAsync( - attachedAddress, + initTargetContract.address, constants.NULL_ADDRESS, constants.NULL_ADDRESS, constants.NULL_ADDRESS,