Merge upstream openzeppelin-contracts into upstream-patched

test/metatx/ERC2771Context.test.js

@@ -76,9 +76,7 @@ contract('ERC2771Context', function (accounts) {
         };
 
         const sign = ethSigUtil.signTypedMessage(this.wallet.getPrivateKey(), { data: { ...this.data, message: req } });
-
-        // rejected by lint :/
-        // expect(await this.forwarder.verify(req, sign)).to.be.true;
+        expect(await this.forwarder.verify(req, sign)).to.equal(true);
 
         const { tx } = await this.forwarder.execute(req, sign);
         await expectEvent.inTransaction(tx, ERC2771ContextMock, 'Sender', { sender: this.sender });
@@ -101,9 +99,7 @@ contract('ERC2771Context', function (accounts) {
         };
 
         const sign = ethSigUtil.signTypedMessage(this.wallet.getPrivateKey(), { data: { ...this.data, message: req } });
-
-        // rejected by lint :/
-        // expect(await this.forwarder.verify(req, sign)).to.be.true;
+        expect(await this.forwarder.verify(req, sign)).to.equal(true);
 
         const { tx } = await this.forwarder.execute(req, sign);
         await expectEvent.inTransaction(tx, ERC2771ContextMock, 'Data', { data, integerValue, stringValue });

test/token/ERC721/ERC721.behavior.js

@@ -12,6 +12,7 @@ const Error = [ 'None', 'RevertWithMessage', 'RevertWithoutMessage', 'Panic' ]
 const firstTokenId = new BN('5042');
 const secondTokenId = new BN('79217');
 const nonExistentTokenId = new BN('13');
+const fourthTokenId = new BN(4);
 const baseURI = 'https://api.example.com/v1/';
 
 const RECEIVER_MAGIC_VALUE = '0x150b7a02';
@@ -342,7 +343,6 @@ function shouldBehaveLikeERC721 (errorPrefix, owner, newOwner, approved, another
     });
 
     describe('safe mint', function () {
-      const fourthTokenId = new BN(4);
       const tokenId = fourthTokenId;
       const data = '0x42';