Merge branch '1.x' into release/1.3.1

test/e2e.method.signing.js

@@ -394,22 +394,26 @@ describe('transaction and message signing [ @E2E ]', function() {
     // Smoke test to validate browserify's buffer polyfills (feross/buffer@5)
     // A companion regression test for Webpack & feross/[email protected] exists at:
     // test/eth.accounts.webpack.js
-    it("encrypt then decrypt wallet", async function() {
-        this.timeout(10000);
-
-        const password = "qwerty";
-        const addressFromWallet = wallet[0].address;
+    it("encrypt then decrypt wallet", function(done) {
+        this.timeout(20000);
+        try {
+            const password = "qwerty";
+            const addressFromWallet = wallet[0].address;
 
-        const keystore = wallet.encrypt(password);
+            const keystore = wallet.encrypt(password);
 
-        // Wallet created w/ 10 accounts in before block
-        assert.equal(keystore.length, 10);
+            // Wallet created w/ 10 accounts in before block
+            assert.equal(keystore.length, 10);
 
-        wallet.decrypt(keystore, password);
-        assert.equal(wallet.length, 10);
+            wallet.decrypt(keystore, password);
+            assert.equal(wallet.length, 10);
 
-        const addressFromKeystore = wallet[0].address;
-        assert.equal(addressFromKeystore, addressFromWallet);
+            const addressFromKeystore = wallet[0].address;
+            assert.equal(addressFromKeystore, addressFromWallet);
+            done()
+        } catch(error) {
+            done(error)
+        }
     });
 });
 

test/eth.ens.js

@@ -148,6 +148,7 @@ describe('ens', function () {
         });
 
         it('should set the owner record for a name', async function () {
+            this.timeout(10000);
             const signature = 'setOwner(bytes32,address)';
 
             prepareProviderForSetter(