Simplify ENS E2E test (#3427)

* Simplify ENS E2E test setup

* Remove script `test:e2e:ens`

* Fix deprecation notices in ens tests (owner => getOwner, resolver => getResolver)

Co-authored-by: Ryan Ghods <[email protected]>

Author: cgewecke

.travis.yml

@@ -23,8 +23,6 @@ matrix:
     - node_js: 12
       env: TEST=e2e_windows
       os: windows
-    - node_js: 10
-      env: TEST=e2e_ens
     - node_js: 10
       env: TEST=e2e_browsers
       addons:

package.json

@@ -47,7 +47,6 @@
         "test:e2e:publish": "./scripts/e2e.npm.publish.sh",
         "test:e2e:truffle": "./scripts/e2e.truffle.sh",
         "test:e2e:mosaic": "./scripts/e2e.mosaic.sh",
-        "test:e2e:ens": "./scripts/e2e.ens.sh",
         "test:e2e:ganache:core": "./scripts/e2e.ganache.core.sh",
         "ci": "./scripts/ci.sh",
         "coveralls": "./scripts/coveralls.sh",

scripts/ci.sh

@@ -23,7 +23,6 @@ elif [ "$TEST" = "unit_and_e2e_clients" ]; then
   npm run test:e2e:ganache
   npm run test:e2e:geth:insta
   npm run test:e2e:geth:auto
-  npm run test:e2e:ens
   npm run test:unit
   npm run coveralls
 
@@ -45,10 +44,6 @@ elif [ "$TEST" = "e2e_mosaic" ]; then
   npm run test:e2e:publish
   npm run test:e2e:mosaic
 
-elif [ "$TEST" = "e2e_ens" ]; then
-
-  npm run test:e2e:ens
-
 elif [ "$TEST" = "e2e_windows" ]; then
 
   bash ./scripts/e2e.npm.publish.sh

scripts/e2e.ens.sh

@@ -0,0 +1,107 @@
+const ENSArtifact = require("@ensdomains/ens/build/contracts/ENSRegistry");
+const FIFSRegistrarArtifact = require("@ensdomains/ens/build/contracts/FIFSRegistrar");
+const ReverseRegistrarArtifact = require("@ensdomains/ens/build/contracts/ReverseRegistrar");
+const PublicResolverArtifact = require("@ensdomains/resolver/build/contracts/PublicResolver");
+const namehash = require('eth-ens-namehash');
+
+const addressZero = "0x0000000000000000000000000000000000000000";
+const addressOne = "0x0000000000000000000000000000000000000001";
+const tld = "test";
+
+async function setupENS(web3) {
+
+    const options = {
+        bytecode: undefined,
+        gasPrice: '1',
+        gas: 5500000
+    }
+
+    const accounts = await web3.eth.getAccounts();
+    const from = { from: accounts[0] };
+
+    // ENS
+    options.data = ENSArtifact.bytecode;
+    const ENS = new web3.eth.Contract(ENSArtifact.abi, options)
+
+    const ens = await ENS
+        .deploy()
+        .send(from);
+
+    // PublicResolver
+    options.data = PublicResolverArtifact.bytecode;
+    const PublicResolver = new web3.eth.Contract(PublicResolverArtifact.abi, options)
+
+    const resolver = await PublicResolver
+        .deploy({ arguments: [ens.options.address] })
+        .send(from);
+
+    await setupResolver(ens, resolver, accounts[0], web3);
+
+    // Registrar
+    options.data = FIFSRegistrarArtifact.bytecode;
+    const FIFSRegistrar = new web3.eth.Contract(FIFSRegistrarArtifact.abi, options)
+
+    const registrar = await FIFSRegistrar
+        .deploy({ arguments: [ens.options.address, namehash.hash(tld)] })
+        .send(from);
+
+    await setupRegistrar(ens, registrar.options.address, accounts[0], web3);
+
+    // Reverse Registrar
+    options.data = ReverseRegistrarArtifact.bytecode;
+    const ReverseRegistrar = new web3.eth.Contract(ReverseRegistrarArtifact.abi, options)
+
+    const reverse = await ReverseRegistrar
+        .deploy({ arguments: [ens.options.address, resolver.options.address] })
+        .send(from);
+
+    await setupReverseRegistrar(ens, reverse.options.address, accounts[0], web3);
+
+    return {
+        registry: ens.options.address,
+        resolver: resolver.options.address,
+        fifsRegistrar: registrar.options.address,
+        reverseRegistrar: reverse.options.address
+    }
+};
+
+async function setupResolver(ens, resolver, account, web3) {
+    const node = namehash.hash("resolver");
+    const label = web3.utils.sha3("resolver");
+
+    await ens
+        .methods
+        .setSubnodeOwner(addressZero, label, account)
+        .send({from: account});
+
+    await ens
+        .methods
+        .setResolver(node, resolver.options.address)
+        .send({from: account});
+
+    await resolver
+        .methods
+        .setAddr(node, addressOne)
+        .send({from: account});
+}
+
+async function setupRegistrar(ens, address, account, web3) {
+    await ens
+        .methods
+        .setSubnodeOwner(addressZero, web3.utils.sha3(tld), address)
+        .send({from: account});
+}
+
+async function setupReverseRegistrar(ens, address, account, web3) {
+    await ens
+        .methods
+        .setSubnodeOwner(addressZero, web3.utils.sha3("reverse"), account)
+        .send({from: account});
+
+    await ens
+        .methods
+        .setSubnodeOwner(namehash.hash("reverse"), web3.utils.sha3("addr"), address)
+        .send({from: account});
+}
+
+module.exports = setupENS

scripts/js/ens.js

@@ -1,23 +1,27 @@
-const addresses = require('./config/ensAddresses');
-const registryAddr = addresses.registry;
-const resolverAddr = addresses.resolver;
+const setupENS = require('../scripts/js/ens');
 const utils = require('./helpers/test.utils');
 const Web3 = utils.getWeb3();
 const assert = require('assert');
 
 describe('ENS [ @E2E ]', function () {
+    this.timeout(50000);
+
     let web3;
     let account;
+    let accounts;
+    let addresses;
+    let registryAddr;
+    let resolverAddr;
+
+    before(async function(){
+        web3 = new Web3('http://localhost:8545');
+        accounts = await web3.eth.getAccounts();
+        account = accounts[0];
 
-    if (!process.env.E2E_ENS) {
-        return;
-    }
-
-    beforeEach(async function () {
-        web3 = new Web3('ws://localhost:' + utils.getWebsocketPort());
+        addresses = await setupENS(web3);
+        registryAddr = addresses.registry;
+        resolverAddr = addresses.resolver;
         web3.eth.ens.registryAddress = registryAddr;
-        const accounts = await web3.eth.getAccounts();
-        account = accounts[0];
     });
 
     it('custom registry got defined in the ENS module', function () {

scripts/js/ens/1_initial_migration.js

@@ -1345,7 +1345,7 @@ describe('ens', function () {
             });
             provider.injectResult('0x0000000000000000000000000123456701234567012345670123456701234567');
 
-            const owner = await web3.eth.ens.registry.owner('foobar.eth');
+            const owner = await web3.eth.ens.registry.getOwner('foobar.eth');
 
             assert.equal(owner, '0x0123456701234567012345670123456701234567');
         });
@@ -1482,7 +1482,7 @@ describe('ens', function () {
             });
             provider.injectResult('0x0000000000000000000000000123456701234567012345670123456701234567');
 
-            const resolver = await web3.eth.ens.resolver('foobar.eth');
+            const resolver = await web3.eth.ens.getResolver('foobar.eth');
 
             assert.equal(resolver.options.address, '0x0123456701234567012345670123456701234567');
         });
@@ -1500,7 +1500,7 @@ describe('ens', function () {
             });
             provider.injectResult('0x0000000000000000000000000123456701234567012345670123456701234567');
 
-            web3.eth.ens.resolver('foobar.eth', function (error, resolver) {
+            web3.eth.ens.getResolver('foobar.eth', function (error, resolver) {
                 assert.equal(resolver.options.address, '0x0123456701234567012345670123456701234567');
                 assert.equal(error.options.address, '0x0123456701234567012345670123456701234567'); // For backward compatibility