Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename SmartToken to ERC827
  • Loading branch information
AugustoL committed Jan 11, 2018
commit e57f4be1fb52b93152b2221c661a27f94f6d15fe
15 changes: 15 additions & 0 deletions contracts/mocks/ERC827TokenMock.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
pragma solidity ^0.4.13;


import '../token/ERC827.sol';


// mock class using ERC827 Token
contract ERC827TokenMock is ERC827 {

function ERC827TokenMock(address initialAccount, uint256 initialBalance) {
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
}

}
15 changes: 0 additions & 15 deletions contracts/mocks/SmartTokenMock.sol

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ pragma solidity ^0.4.13;
import "./StandardToken.sol";

/**
@title SmartToken, an extension of ERC20 token standard
@title ERC827, an extension of ERC20 token standard

Implementation the SmartToken, following the ERC20 standard with extra
Implementation the ERC827, following the ERC20 standard with extra
methods to transfer value and data and execute calls in transfers and
approvals.
Uses OpenZeppelin StandardToken.
*/
contract SmartToken is StandardToken {
contract ERC827 is StandardToken {

/**
@dev `approveData` is an addition to ERC20 token methods. It allows to
Expand Down
8 changes: 4 additions & 4 deletions test/SmartToken.js → test/ERC827Token.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import EVMRevert from './helpers/EVMRevert';
var Message = artifacts.require('./mock/MessageHelper.sol');
var SmartTokenMock = artifacts.require('./mock/SmartTokenMock.sol');
var ERC827TokenMock = artifacts.require('./mock/ERC827TokenMock.sol');

var BigNumber = web3.BigNumber;

Expand All @@ -10,11 +10,11 @@ require('chai')
.use(require('chai-bignumber')(BigNumber))
.should();

contract('SmartToken', function (accounts) {
contract('ERC827 Token', function (accounts) {
let token;

beforeEach(async function () {
token = await SmartTokenMock.new(accounts[0], 100);
token = await ERC827TokenMock.new(accounts[0], 100);
});

it('should return the correct totalSupply after construction', async function () {
Expand All @@ -24,7 +24,7 @@ contract('SmartToken', function (accounts) {
});

it('should return the correct allowance amount after approval', async function () {
let token = await SmartTokenMock.new();
let token = await ERC827TokenMock.new();
await token.approve(accounts[1], 100);
let allowance = await token.allowance(accounts[0], accounts[1]);

Expand Down