Skip to content

Rename SupportsInterfaceWithLookup to ERC165 #1288

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
nventuro merged 2 commits into from
Sep 6, 2018
Merged

Rename SupportsInterfaceWithLookup to ERC165 #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccd4da6
rename SupportsInterfaceWithLookup to ERC165
frangio Sep 6, 2018
0a7a2cb
rename SupportsInterfaceWithLookup files to ERC165
frangio Sep 6, 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
4 changes: 2 additions & 2 deletions ...ospection/SupportsInterfaceWithLookup.sol → contracts/introspection/ERC165.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import "./IERC165.sol";


/**
* @title SupportsInterfaceWithLookup
* @title ERC165
* @author Matt Condon (@shrugs)
* @dev Implements ERC165 using a lookup table.
*/
contract SupportsInterfaceWithLookup is IERC165 {
contract ERC165 is IERC165 {

bytes4 private constant InterfaceId_ERC165 = 0x01ffc9a7;
/**
Expand Down
4 changes: 2 additions & 2 deletions ...mocks/SupportsInterfaceWithLookupMock.sol → contracts/mocks/ERC165Mock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pragma solidity ^0.4.24;

import "../introspection/SupportsInterfaceWithLookup.sol";
import "../introspection/ERC165.sol";


contract SupportsInterfaceWithLookupMock is SupportsInterfaceWithLookup {
contract ERC165Mock is ERC165 {
function registerInterface(bytes4 _interfaceId)
public
{
Expand Down
4 changes: 2 additions & 2 deletions contracts/token/ERC721/ERC721.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pragma solidity ^0.4.24;

import "./IERC721.sol";
import "./ERC721Basic.sol";
import "../../introspection/SupportsInterfaceWithLookup.sol";
import "../../introspection/ERC165.sol";


/**
Expand All @@ -11,7 +11,7 @@ import "../../introspection/SupportsInterfaceWithLookup.sol";
* Moreover, it includes approve all functionality using operator terminology
* @dev see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
*/
contract ERC721 is SupportsInterfaceWithLookup, ERC721Basic, IERC721 {
contract ERC721 is ERC165, ERC721Basic, IERC721 {

// Token name
string internal name_;
Expand Down
4 changes: 2 additions & 2 deletions contracts/token/ERC721/ERC721Basic.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import "./IERC721Basic.sol";
import "./IERC721Receiver.sol";
import "../../math/SafeMath.sol";
import "../../utils/Address.sol";
import "../../introspection/SupportsInterfaceWithLookup.sol";
import "../../introspection/ERC165.sol";


/**
* @title ERC721 Non-Fungible Token Standard basic implementation
* @dev see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
*/
contract ERC721Basic is SupportsInterfaceWithLookup, IERC721Basic {
contract ERC721Basic is ERC165, IERC721Basic {

using SafeMath for uint256;
using Address for address;
Expand Down
6 changes: 3 additions & 3 deletions ...ction/SupportsInterfaceWithLookup.test.js → test/introspection/ERC165.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const { shouldSupportInterfaces } = require('./SupportsInterface.behavior');
const { assertRevert } = require('../helpers/assertRevert');

const SupportsInterfaceWithLookup = artifacts.require('SupportsInterfaceWithLookupMock');
const ERC165 = artifacts.require('ERC165Mock');

require('chai')
.should();

contract('SupportsInterfaceWithLookup', function () {
contract('ERC165', function () {
beforeEach(async function () {
this.mock = await SupportsInterfaceWithLookup.new();
this.mock = await ERC165.new();
});

it('does not allow 0xffffffff', async function () {
Expand Down