Merge upstream master into patched/master

package-lock.json

@@ -43,7 +43,7 @@
         "semver": "^7.3.5",
         "solhint": "^3.3.6",
         "solidity-ast": "^0.4.25",
-        "solidity-coverage": "^0.7.11",
+        "solidity-coverage": "^0.7.18",
         "solidity-docgen": "^0.5.3",
         "web3": "^1.3.0",
         "yargs": "^16.2.0"
@@ -16579,9 +16579,9 @@
       "dev": true
     },
     "node_modules/solidity-coverage": {
-      "version": "0.7.17",
-      "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.17.tgz",
-      "integrity": "sha512-Erw2hd2xdACAvDX8jUdYkmgJlIIazGznwDJA5dhRaw4def2SisXN9jUjneeyOZnl/E7j6D3XJYug4Zg9iwodsg==",
+      "version": "0.7.18",
+      "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.18.tgz",
+      "integrity": "sha512-H1UhB9QqLISJPgttaulnStUyOaJm0wZXvBGWUN9+HH3dl2hYjSmo3RBBFRm7U+dBNpPysS835XFGe+hG4ZhMrA==",
       "dev": true,
       "dependencies": {
         "@solidity-parser/parser": "^0.13.2",
@@ -33568,9 +33568,9 @@
       "dev": true
     },
     "solidity-coverage": {
-      "version": "0.7.17",
-      "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.17.tgz",
-      "integrity": "sha512-Erw2hd2xdACAvDX8jUdYkmgJlIIazGznwDJA5dhRaw4def2SisXN9jUjneeyOZnl/E7j6D3XJYug4Zg9iwodsg==",
+      "version": "0.7.18",
+      "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.18.tgz",
+      "integrity": "sha512-H1UhB9QqLISJPgttaulnStUyOaJm0wZXvBGWUN9+HH3dl2hYjSmo3RBBFRm7U+dBNpPysS835XFGe+hG4ZhMrA==",
       "dev": true,
       "requires": {
         "@solidity-parser/parser": "^0.13.2",

package.json

@@ -82,7 +82,7 @@
     "semver": "^7.3.5",
     "solhint": "^3.3.6",
     "solidity-ast": "^0.4.25",
-    "solidity-coverage": "^0.7.11",
+    "solidity-coverage": "^0.7.18",
     "solidity-docgen": "^0.5.3",
     "web3": "^1.3.0",
     "yargs": "^16.2.0"

test/utils/introspection/SupportsInterface.behavior.js

@@ -99,11 +99,11 @@ function shouldSupportInterfaces (interfaces = []) {
       const interfaceId = INTERFACE_IDS[k];
       describe(k, function () {
         describe('ERC165\'s supportsInterface(bytes4)', function () {
-          it('uses less than 30k gas [skip-on-coverage]', async function () {
+          it('uses less than 30k gas', async function () {
             expect(await this.contractUnderTest.supportsInterface.estimateGas(interfaceId)).to.be.lte(30000);
           });
 
-          it('claims support [skip-on-coverage]', async function () {
+          it('claims support', async function () {
             expect(await this.contractUnderTest.supportsInterface(interfaceId)).to.equal(true);
           });
         });