Skip to content

Commit

Permalink
Replaces amount with value for consistency (#1378)
Browse files Browse the repository at this point in the history
* fixes #1372

* done in ERC20Capped and ERC20Mintable

(cherry picked from commit fd4de77)
  • Loading branch information
Aniket-Engg authored and come-maiz committed Oct 20, 2018
1 parent 13fb1f6 commit 109eba9
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
32 changes: 16 additions & 16 deletions contracts/token/ERC20/ERC20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -168,44 +168,44 @@ 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);
}

/**
* @dev Internal function that burns an amount of the token of a given
* 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);
}
}
8 changes: 4 additions & 4 deletions contracts/token/ERC20/ERC20Capped.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
6 changes: 3 additions & 3 deletions contracts/token/ERC20/ERC20Mintable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

0 comments on commit 109eba9

Please sign in to comment.