Improve revert reason when assuming interface compliance OpenZeppelin…

…#1727
NoopurShinde · Oct 11, 2019 · 3d96ecf · 3d96ecf
1 parent 1ca3742
commit 3d96ecf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
diff --git a/contracts/mocks/ERC721ReceiverNotImplementedMock.sol b/contracts/mocks/ERC721ReceiverNotImplementedMock.sol
@@ -2,5 +2,14 @@ pragma solidity ^0.5.0;
 
 
  contract  ERC721ReceiverNotImplementedMock{
-
+    bytes4 private _retval;
+    bool private _reverts;
+
+    event Received(address operator, address from, uint256 tokenId, bytes data, uint256 gas);
+
+    constructor (bytes4 retval, bool reverts) public {
+        _retval = retval;
+        _reverts = reverts;
+    }
+
   }
diff --git a/test/token/ERC721/ERC721.behavior.js b/test/token/ERC721/ERC721.behavior.js
@@ -300,7 +300,7 @@ function shouldBehaveLikeERC721 (
 
         describe('to a receiver contract returning unexpected value', function () {
           it('reverts', async function () {
-            const noReceiverImplemented = await ERC721NoReceiverMock.new();
+            const noReceiverImplemented = await ERC721NoReceiverMock.new(RECEIVER_MAGIC_VALUE, true);
             await expectRevert(
               this.token.safeTransferFrom(owner, noReceiverImplemented.address, tokenId, { from: owner }),
               'ERC721: to address does not implement ERC721Received interface'
@@ -320,7 +320,7 @@ function shouldBehaveLikeERC721 (
 
         describe('to a contract that does not implement the required function', function () {
           it('reverts', async function () {
-            const noReceiverImplemented = await ERC721NoReceiverMock.new();
+            const noReceiverImplemented = await ERC721NoReceiverMock.new(RECEIVER_MAGIC_VALUE, true);
             await expectRevert(
               this.token.safeTransferFrom(owner, noReceiverImplemented.address, tokenId, { from: owner }),
               'ERC721: to address does not implement ERC721Received interface'
@@ -369,7 +369,7 @@ function shouldBehaveLikeERC721 (
 
         context('to a receiver contract returning unexpected value', function () {
           it('reverts', async function () {
-            const noReceiverImplemented = await ERC721NoReceiverMock.new();
+            const noReceiverImplemented = await ERC721NoReceiverMock.new(RECEIVER_MAGIC_VALUE, true);
             await expectRevert(
               this.ERC721Mock.safeMint(noReceiverImplemented.address, tokenId),
               'ERC721: to address does not implement ERC721Received interface'