Merge pull request #16 from cgewecke/fix/coverage

Fix coverage
decentraland · Jan 15, 2020 · 744dcf0 · 744dcf0
2 parents 002ac64 + eec8d94
commit 744dcf0
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 26 deletions.
diff --git a/.solcover.js b/.solcover.js
@@ -0,0 +1,11 @@
+module.exports = {
+  skipFiles: ['mocks', 'utils/Migrations.sol'],
+  providerOptions: {
+      default_balance_ether: 1000000000,
+      total_accounts: 20
+  },
+  mocha: {
+    grep: "@skip-on-coverage",
+    invert: true
+  }
+}
diff --git a/buidler.config.js b/buidler.config.js
@@ -18,11 +18,5 @@ module.exports = {
       enabled: true,
       runs: 200
     }
-  },
-  networks: {
-    soliditycoverage: {
-      gas: 9000000,
-      url: 'http://localhost:8555'
-    }
   }
 }
diff --git a/test/contracts/ENSBaseRegistrar.sol → contracts/mocks/ENSBaseRegistrar.sol b/test/contracts/ENSBaseRegistrar.sol → contracts/mocks/ENSBaseRegistrar.sol
diff --git a/test/contracts/ENSPublicResolver.sol → contracts/mocks/ENSPublicResolver.sol b/test/contracts/ENSPublicResolver.sol → contracts/mocks/ENSPublicResolver.sol
diff --git a/test/contracts/ENSRegistry.sol → contracts/mocks/ENSRegistry.sol b/test/contracts/ENSRegistry.sol → contracts/mocks/ENSRegistry.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.15;
 
-import "../../contracts/interfaces/IENSRegistry.sol";
+import "../interfaces/IENSRegistry.sol";
 
 contract FakeENSRegistryFactory {
     address public ensRegistryAddress;

diff --git a/test/contracts/FakeDCLController.sol → contracts/mocks/FakeDCLController.sol b/test/contracts/FakeDCLController.sol → contracts/mocks/FakeDCLController.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.15;
 
-import "../../contracts/ens/DCLController.sol";
+import "../ens/DCLController.sol";
 
 
 contract FakeDCLController is DCLController {

diff --git a/test/contracts/FakeDCLRegistrar.sol → contracts/mocks/FakeDCLRegistrar.sol b/test/contracts/FakeDCLRegistrar.sol → contracts/mocks/FakeDCLRegistrar.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.15;
 
-import "../../contracts/ens/DCLRegistrar.sol";
+import "../ens/DCLRegistrar.sol";
 
 
 contract FakeDCLRegistrar is DCLRegistrar {

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/Subdomain.spec.js b/test/Subdomain.spec.js
@@ -104,7 +104,7 @@ describe('DCL Names V2', function() {
 
     creationParams = {
       ...fromDeployer,
-      gas: 6e6,
+      //gas: 6e6,
       gasPrice: 21e9
     }
 
@@ -2217,7 +2217,7 @@ describe('DCL Names V2', function() {
       expect(subdomainOwner).to.be.equal(anotherUser)
     })
 
-    it('reverts when trying to change the resolver by an unauthorized account', async function() {
+    it('reverts when trying to change the resolver by an unauthorized account [ @skip-on-coverage ]', async function() {
       await dclControllerContract.register(subdomain1, user, fromUser)
 
       await assertRevert(
@@ -2312,15 +2312,15 @@ describe('DCL Names V2', function() {
       )
     })
 
-    it('reverts when trying to set the owner for subdomain by an unauthorized account', async function() {
+    it('reverts when trying to set the owner for subdomain by an unauthorized account [ @skip-on-coverage ]', async function() {
       await dclControllerContract.register(subdomain1, user, fromUser)
 
       await assertRevert(
         ensRegistryContract.setOwner(subdomain1Hash, anotherUser, fromHacker)
       )
     })
 
-    it('reverts when trying to set a subnode owner for a domain by an unauthorized account', async function() {
+    it('reverts when trying to set a subnode owner for a domain by an unauthorized account [ @skip-on-coverage ]', async function() {
       await assertRevert(
         ensRegistryContract.setSubnodeOwner(
           dclDomainHash,