Refactor supports interface (#4817)

OpenZeppelin · Jan 12, 2024 · e68720e · e68720e
1 parent 920225a
commit e68720e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/test/governance/Governor.test.js b/test/governance/Governor.test.js
@@ -96,7 +96,7 @@ describe('Governor', function () {
         );
       });
 
-      shouldSupportInterfaces(['ERC165', 'ERC1155Receiver', 'Governor']);
+      shouldSupportInterfaces(['ERC1155Receiver', 'Governor']);
       shouldBehaveLikeERC6372(mode);
 
       it('deployment check', async function () {

diff --git a/test/token/ERC1155/ERC1155.behavior.js b/test/token/ERC1155/ERC1155.behavior.js
@@ -754,7 +754,7 @@ function shouldBehaveLikeERC1155() {
       });
     });
 
-    shouldSupportInterfaces(['ERC165', 'ERC1155', 'ERC1155MetadataURI']);
+    shouldSupportInterfaces(['ERC1155', 'ERC1155MetadataURI']);
   });
 }
 

diff --git a/test/token/ERC1155/utils/ERC1155Holder.test.js b/test/token/ERC1155/utils/ERC1155Holder.test.js
@@ -24,7 +24,7 @@ describe('ERC1155Holder', function () {
     Object.assign(this, await loadFixture(fixture));
   });
 
-  shouldSupportInterfaces(['ERC165', 'ERC1155Receiver']);
+  shouldSupportInterfaces(['ERC1155Receiver']);
 
   it('receives ERC1155 tokens from a single ID', async function () {
     await this.token.connect(this.owner).safeTransferFrom(this.owner, this.mock, ids[0], values[0], data);

diff --git a/test/token/ERC721/ERC721.behavior.js b/test/token/ERC721/ERC721.behavior.js
@@ -20,7 +20,7 @@ function shouldBehaveLikeERC721() {
     Object.assign(this, { owner, newOwner, approved, operator, other });
   });
 
-  shouldSupportInterfaces(['ERC165', 'ERC721']);
+  shouldSupportInterfaces(['ERC721']);
 
   describe('with minted tokens', function () {
     beforeEach(async function () {

diff --git a/test/utils/introspection/ERC165.test.js b/test/utils/introspection/ERC165.test.js
@@ -14,5 +14,5 @@ describe('ERC165', function () {
     Object.assign(this, await loadFixture(fixture));
   });
 
-  shouldSupportInterfaces(['ERC165']);
+  shouldSupportInterfaces();
 });
diff --git a/test/utils/introspection/SupportsInterface.behavior.js b/test/utils/introspection/SupportsInterface.behavior.js
@@ -85,9 +85,11 @@ const SIGNATURES = {
 const INTERFACE_IDS = mapValues(SIGNATURES, interfaceId);
 
 function shouldSupportInterfaces(interfaces = []) {
+  interfaces.unshift('ERC165');
+
   describe('ERC165', function () {
     beforeEach(function () {
-      this.contractUnderTest = this.mock || this.token || this.holder;
+      this.contractUnderTest = this.mock || this.token;
     });
 
     describe('when the interfaceId is supported', function () {
-Original file line number
+Diff line change
@@ Expand Up / @@ -754,7 +754,7 @@ function shouldBehaveLikeERC1155() { @@
           });
         });
-        shouldSupportInterfaces(['ERC165', 'ERC1155', 'ERC1155MetadataURI']);
+        shouldSupportInterfaces(['ERC1155', 'ERC1155MetadataURI']);
       });
     }
@@ Expand Down @@