From 661e5d86dc3e2e4246ff4cdc41ed082d41c74f19 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Thu, 6 Sep 2018 19:37:14 -0300 Subject: [PATCH] Rename SupportsInterfaceWithLookup to ERC165 (#1288) * rename SupportsInterfaceWithLookup to ERC165 * rename SupportsInterfaceWithLookup files to ERC165 --- .../{SupportsInterfaceWithLookup.sol => ERC165.sol} | 4 ++-- .../{SupportsInterfaceWithLookupMock.sol => ERC165Mock.sol} | 4 ++-- contracts/token/ERC721/ERC721.sol | 4 ++-- contracts/token/ERC721/ERC721Basic.sol | 4 ++-- .../{SupportsInterfaceWithLookup.test.js => ERC165.test.js} | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename contracts/introspection/{SupportsInterfaceWithLookup.sol => ERC165.sol} (92%) rename contracts/mocks/{SupportsInterfaceWithLookupMock.sol => ERC165Mock.sol} (50%) rename test/introspection/{SupportsInterfaceWithLookup.test.js => ERC165.test.js} (66%) diff --git a/contracts/introspection/SupportsInterfaceWithLookup.sol b/contracts/introspection/ERC165.sol similarity index 92% rename from contracts/introspection/SupportsInterfaceWithLookup.sol rename to contracts/introspection/ERC165.sol index 6fca22ac8..70868ff67 100644 --- a/contracts/introspection/SupportsInterfaceWithLookup.sol +++ b/contracts/introspection/ERC165.sol @@ -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; /** diff --git a/contracts/mocks/SupportsInterfaceWithLookupMock.sol b/contracts/mocks/ERC165Mock.sol similarity index 50% rename from contracts/mocks/SupportsInterfaceWithLookupMock.sol rename to contracts/mocks/ERC165Mock.sol index e1c95fc07..63a39bbb2 100644 --- a/contracts/mocks/SupportsInterfaceWithLookupMock.sol +++ b/contracts/mocks/ERC165Mock.sol @@ -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 { diff --git a/contracts/token/ERC721/ERC721.sol b/contracts/token/ERC721/ERC721.sol index a2c63ef55..ca6d7b89d 100644 --- a/contracts/token/ERC721/ERC721.sol +++ b/contracts/token/ERC721/ERC721.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.24; import "./IERC721.sol"; import "./ERC721Basic.sol"; -import "../../introspection/SupportsInterfaceWithLookup.sol"; +import "../../introspection/ERC165.sol"; /** @@ -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_; diff --git a/contracts/token/ERC721/ERC721Basic.sol b/contracts/token/ERC721/ERC721Basic.sol index fcc8397ea..cf09e8178 100644 --- a/contracts/token/ERC721/ERC721Basic.sol +++ b/contracts/token/ERC721/ERC721Basic.sol @@ -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; diff --git a/test/introspection/SupportsInterfaceWithLookup.test.js b/test/introspection/ERC165.test.js similarity index 66% rename from test/introspection/SupportsInterfaceWithLookup.test.js rename to test/introspection/ERC165.test.js index e8bccdf43..37a24637d 100644 --- a/test/introspection/SupportsInterfaceWithLookup.test.js +++ b/test/introspection/ERC165.test.js @@ -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 () {