From 109eba9273f37a70ddbfc32f64d11a91078e47b8 Mon Sep 17 00:00:00 2001 From: Aniket <30843294+Aniket-Engg@users.noreply.github.com> Date: Thu, 4 Oct 2018 16:21:52 +0530 Subject: [PATCH] Replaces `amount` with `value` for consistency (#1378) * fixes #1372 * done in ERC20Capped and ERC20Mintable (cherry picked from commit fd4de776519e2bd64dc6ac0efb87e0f603c6608f) --- contracts/token/ERC20/ERC20.sol | 32 ++++++++++++------------- contracts/token/ERC20/ERC20Capped.sol | 8 +++---- contracts/token/ERC20/ERC20Mintable.sol | 6 ++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20/ERC20.sol index 3d18c1dec67..25b2694a24f 100644 --- a/contracts/token/ERC20/ERC20.sol +++ b/contracts/token/ERC20/ERC20.sol @@ -168,28 +168,28 @@ contract ERC20 is IERC20 { * an account. This encapsulates the modification of balances such that the * proper events are emitted. * @param account The account that will receive the created tokens. - * @param amount The amount that will be created. + * @param value The amount that will be created. */ - function _mint(address account, uint256 amount) internal { + function _mint(address account, uint256 value) internal { require(account != 0); - _totalSupply = _totalSupply.add(amount); - _balances[account] = _balances[account].add(amount); - emit Transfer(address(0), account, amount); + _totalSupply = _totalSupply.add(value); + _balances[account] = _balances[account].add(value); + emit Transfer(address(0), account, value); } /** * @dev Internal function that burns an amount of the token of a given * account. * @param account The account whose tokens will be burnt. - * @param amount The amount that will be burnt. + * @param value The amount that will be burnt. */ - function _burn(address account, uint256 amount) internal { + function _burn(address account, uint256 value) internal { require(account != 0); - require(amount <= _balances[account]); + require(value <= _balances[account]); - _totalSupply = _totalSupply.sub(amount); - _balances[account] = _balances[account].sub(amount); - emit Transfer(account, address(0), amount); + _totalSupply = _totalSupply.sub(value); + _balances[account] = _balances[account].sub(value); + emit Transfer(account, address(0), value); } /** @@ -197,15 +197,15 @@ contract ERC20 is IERC20 { * account, deducting from the sender's allowance for said account. Uses the * internal burn function. * @param account The account whose tokens will be burnt. - * @param amount The amount that will be burnt. + * @param value The amount that will be burnt. */ - function _burnFrom(address account, uint256 amount) internal { - require(amount <= _allowed[account][msg.sender]); + function _burnFrom(address account, uint256 value) internal { + require(value <= _allowed[account][msg.sender]); // Should https://github.com/OpenZeppelin/zeppelin-solidity/issues/707 be accepted, // this function needs to emit an event with the updated approval. _allowed[account][msg.sender] = _allowed[account][msg.sender].sub( - amount); - _burn(account, amount); + value); + _burn(account, value); } } diff --git a/contracts/token/ERC20/ERC20Capped.sol b/contracts/token/ERC20/ERC20Capped.sol index 0a73159b6ac..9f3ea8bfc04 100644 --- a/contracts/token/ERC20/ERC20Capped.sol +++ b/contracts/token/ERC20/ERC20Capped.sol @@ -27,19 +27,19 @@ contract ERC20Capped is ERC20Mintable { /** * @dev Function to mint tokens * @param to The address that will receive the minted tokens. - * @param amount The amount of tokens to mint. + * @param value The amount of tokens to mint. * @return A boolean that indicates if the operation was successful. */ function mint( address to, - uint256 amount + uint256 value ) public returns (bool) { - require(totalSupply().add(amount) <= _cap); + require(totalSupply().add(value) <= _cap); - return super.mint(to, amount); + return super.mint(to, value); } } diff --git a/contracts/token/ERC20/ERC20Mintable.sol b/contracts/token/ERC20/ERC20Mintable.sol index 386abf64d27..eb01f06e74e 100644 --- a/contracts/token/ERC20/ERC20Mintable.sol +++ b/contracts/token/ERC20/ERC20Mintable.sol @@ -11,18 +11,18 @@ contract ERC20Mintable is ERC20, MinterRole { /** * @dev Function to mint tokens * @param to The address that will receive the minted tokens. - * @param amount The amount of tokens to mint. + * @param value The amount of tokens to mint. * @return A boolean that indicates if the operation was successful. */ function mint( address to, - uint256 amount + uint256 value ) public onlyMinter returns (bool) { - _mint(to, amount); + _mint(to, value); return true; } }