NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ERC827.sol to not use function overloading (#871)

Browse Source 
* Update ERC827.sol to not use function overloading

* updated tests for erc827 function name changes

* fixed broken test

* removed findMethod from erc827 tests that is no longer necessary
This commit is contained in:
Elie
2018-04-23 14:39:34 +03:00
committed by Augusto Lemble
parent 77cc33fc5c
commit 16535fbb87
3 changed files with 29 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/token/ERC827/ERC827.sol
View File

@ -12,9 +12,9 @@ import "../ERC20/ERC20.sol";
* @dev approvals.
*/
contract ERC827 is ERC20 {
function approve(address _spender, uint256 _value, bytes _data) public returns (bool);
function transfer(address _to, uint256 _value, bytes _data) public returns (bool);
function transferFrom(
function approveAndCall( address _spender, uint256 _value, bytes _data) public returns (bool);
function transferAndCall( address _to, uint256 _value, bytes _data) public returns (bool);
function transferFromAndCall(
address _from,
address _to,
uint256 _value,

10
contracts/token/ERC827/ERC827Token.sol
View File

@ -34,7 +34,7 @@ contract ERC827Token is ERC827, StandardToken {
*
* @return true if the call function was executed successfully
*/
function approve(address _spender, uint256 _value, bytes _data) public returns (bool) {
function approveAndCall(address _spender, uint256 _value, bytes _data) public returns (bool) {
require(_spender != address(this));
super.approve(_spender, _value);
@ -54,7 +54,7 @@ contract ERC827Token is ERC827, StandardToken {
*
* @return true if the call function was executed successfully
*/
function transfer(address _to, uint256 _value, bytes _data) public returns (bool) {
function transferAndCall(address _to, uint256 _value, bytes _data) public returns (bool) {
require(_to != address(this));
super.transfer(_to, _value);
@ -74,7 +74,7 @@ contract ERC827Token is ERC827, StandardToken {
*
* @return true if the call function was executed successfully
*/
function transferFrom(
function transferFromAndCall(
address _from,
address _to,
uint256 _value,
@ -103,7 +103,7 @@ contract ERC827Token is ERC827, StandardToken {
* @param _addedValue The amount of tokens to increase the allowance by.
* @param _data ABI-encoded contract call to call `_spender` address.
*/
function increaseApproval(address _spender, uint _addedValue, bytes _data) public returns (bool) {
function increaseApprovalAndCall(address _spender, uint _addedValue, bytes _data) public returns (bool) {
require(_spender != address(this));
super.increaseApproval(_spender, _addedValue);
@ -126,7 +126,7 @@ contract ERC827Token is ERC827, StandardToken {
* @param _subtractedValue The amount of tokens to decrease the allowance by.
* @param _data ABI-encoded contract call to call `_spender` address.
*/
function decreaseApproval(address _spender, uint _subtractedValue, bytes _data) public returns (bool) {
function decreaseApprovalAndCall(address _spender, uint _subtractedValue, bytes _data) public returns (bool) {
require(_spender != address(this));
super.decreaseApproval(_spender, _subtractedValue);