Skip to content

Rename ERC interfaces to I prefix #1252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frangio merged 27 commits into from
Aug 31, 2018
Merged

Rename ERC interfaces to I prefix #1252

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
743b54b
rename ERC20 to IERC20
frangio Aug 28, 2018
74ed563
move ERC20.sol to IERC20.sol
frangio Aug 28, 2018
e2cd31e
rename StandardToken to ERC20
frangio Aug 28, 2018
9891e06
rename StandardTokenMock to ERC20Mock
frangio Aug 29, 2018
9ff5308
move StandardToken.sol to ERC20.sol, likewise test and mock files
frangio Aug 29, 2018
0da0906
rename MintableToken to ERC20Mintable
frangio Aug 29, 2018
f0b10ed
move MintableToken.sol to ERC20Mintable.sol, likewise test and mock f…
frangio Aug 29, 2018
05a3484
rename BurnableToken to ERC20Burnable
frangio Aug 29, 2018
06cc72c
move BurnableToken.sol to ERC20Burnable.sol, likewise for related files
frangio Aug 29, 2018
d422ca0
rename CappedToken to ERC20Capped
frangio Aug 29, 2018
1b176ee
move CappedToken.sol to ERC20Capped.sol, likewise for related files
frangio Aug 29, 2018
b537307
rename PausableToken to ERC20Pausable
frangio Aug 29, 2018
890574c
move PausableToken.sol to ERC20Pausable.sol, likewise for related files
frangio Aug 29, 2018
f76cfae
rename DetailedERC20 to ERC20Detailed
frangio Aug 29, 2018
50c43fe
move DetailedERC20.sol to ERC20Detailed.sol, likewise for related files
frangio Aug 29, 2018
7f4cb7d
rename ERC721 to IERC721, and likewise for other related interfaces
frangio Aug 29, 2018
1e79c63
move ERC721.sol to IERC721.sol, likewise for other 721 interfaces
frangio Aug 29, 2018
af192a7
rename ERC721Token to ERC721
frangio Aug 29, 2018
47f542a
move ERC721Token.sol to ERC721.sol, likewise for related files
frangio Aug 29, 2018
276bfb9
rename ERC721BasicToken to ERC721Basic
frangio Aug 29, 2018
463a01b
move ERC721BasicToken.sol to ERC721Basic.sol, likewise for related files
frangio Aug 29, 2018
05d9ae8
rename ERC721PausableToken to ERC721Pausable
frangio Aug 29, 2018
6795ac4
move ERC721PausableToken.sol to ERC721Pausable.sol
frangio Aug 29, 2018
ef3bffe
rename ERC165 to IERC165
frangio Aug 29, 2018
81ea4a8
move ERC165.sol to IERC165.sol
frangio Aug 29, 2018
2cc6332
amend comment that ERC20 is based on FirstBlood
frangio Aug 29, 2018
bb65756
fix comments mentioning IERC721Receiver
frangio Aug 30, 2018
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
move MintableToken.sol to ERC20Mintable.sol, likewise test and mock f… 
…iles
  • Loading branch information
@frangio
frangio committed Aug 29, 2018
commit f0b10ed39a14bca9a67a6c27d7515565e6e61d22
2 changes: 1 addition & 1 deletion contracts/crowdsale/emission/MintedCrowdsale.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity ^0.4.24;

import "../Crowdsale.sol";
import "../../token/ERC20/MintableToken.sol";
import "../../token/ERC20/ERC20Mintable.sol";


/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/examples/SampleCrowdsale.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.4.24;
import "../crowdsale/validation/CappedCrowdsale.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol";
import "../crowdsale/emission/MintedCrowdsale.sol";
import "../token/ERC20/MintableToken.sol";
import "../token/ERC20/ERC20Mintable.sol";


/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/FinalizableCrowdsaleImpl.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.4.24;

import "../token/ERC20/MintableToken.sol";
import "../token/ERC20/ERC20Mintable.sol";
import "../crowdsale/distribution/FinalizableCrowdsale.sol";


Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/MintedCrowdsaleImpl.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.4.24;

import "../token/ERC20/MintableToken.sol";
import "../token/ERC20/ERC20Mintable.sol";
import "../crowdsale/emission/MintedCrowdsale.sol";


Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/RefundableCrowdsaleImpl.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.4.24;

import "../token/ERC20/MintableToken.sol";
import "../token/ERC20/ERC20Mintable.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol";


Expand Down
2 changes: 1 addition & 1 deletion contracts/token/ERC20/CappedToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.4.24;

import "./MintableToken.sol";
import "./ERC20Mintable.sol";


/**
Expand Down
0 contracts/token/ERC20/MintableToken.sol → contracts/token/ERC20/ERC20Mintable.sol
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion contracts/token/ERC20/RBACMintableToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.4.24;

import "./MintableToken.sol";
import "./ERC20Mintable.sol";
import "../../access/rbac/RBAC.sol";


Expand Down
2 changes: 1 addition & 1 deletion test/token/ERC20/CappedToken.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { assertRevert } = require('../../helpers/assertRevert');
const { ether } = require('../../helpers/ether');
const { shouldBehaveLikeERC20Mintable } = require('./MintableToken.behavior');
const { shouldBehaveLikeERC20Mintable } = require('./ERC20Mintable.behavior');
const { shouldBehaveLikeCappedToken } = require('./CappedToken.behavior');

const CappedToken = artifacts.require('CappedToken');
Expand Down
0 test/token/ERC20/MintableToken.behavior.js → test/token/ERC20/ERC20Mintable.behavior.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/token/ERC20/MintableToken.test.js → test/token/ERC20/ERC20Mintable.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { shouldBehaveLikeERC20Mintable } = require('./MintableToken.behavior');
const { shouldBehaveLikeERC20Mintable } = require('./ERC20Mintable.behavior');
const ERC20Mintable = artifacts.require('ERC20Mintable');

contract('ERC20Mintable', function ([_, owner, ...otherAccounts]) {
Expand Down
2 changes: 1 addition & 1 deletion test/token/ERC20/RBACCappedToken.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { ether } = require('../../helpers/ether');
const { shouldBehaveLikeRBACMintableToken } = require('./RBACMintableToken.behavior');
const { shouldBehaveLikeERC20Mintable } = require('./MintableToken.behavior');
const { shouldBehaveLikeERC20Mintable } = require('./ERC20Mintable.behavior');
const { shouldBehaveLikeCappedToken } = require('./CappedToken.behavior');

const RBACCappedTokenMock = artifacts.require('RBACCappedTokenMock');
Expand Down
2 changes: 1 addition & 1 deletion test/token/ERC20/RBACMintableToken.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { shouldBehaveLikeRBACMintableToken } = require('./RBACMintableToken.behavior');
const { shouldBehaveLikeERC20Mintable } = require('./MintableToken.behavior');
const { shouldBehaveLikeERC20Mintable } = require('./ERC20Mintable.behavior');

const RBACMintableToken = artifacts.require('RBACMintableToken');

Expand Down