Fix tests

Devilla · Oct 7, 2021 · 2ee6841 · 2ee6841
1 parent d2d86d9
commit 2ee6841
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 47 deletions.
diff --git a/test/dnssec-oracle/TestDNSSEC.js b/test/dnssec-oracle/TestDNSSEC.js
@@ -101,7 +101,7 @@ async function verifyFailedSubmission(instance, data, sig, proof) {
     // Assert ganache revert exception
     assert.equal(
       error.message,
-      'Transaction reverted without a reason'
+      'Transaction reverted without a reason string'
     );
   }
 

diff --git a/test/ethregistrar/TestEthRegistrarController.js b/test/ethregistrar/TestEthRegistrarController.js
@@ -86,7 +86,7 @@ contract('ETHRegistrarController', function (accounts) {
 
         await evm.advanceTime((await controller.minCommitmentAge()).toNumber());
         var balanceBefore = await web3.eth.getBalance(controller.address);
-        var tx = await controller.register("newname", registrantAccount, 28 * DAYS, secret, {value: 28 * DAYS + 1, gasPrice: 0});
+        var tx = await controller.register("newname", registrantAccount, 28 * DAYS, secret, {value: 28 * DAYS + 1});
         assert.equal(tx.logs.length, 1);
         assert.equal(tx.logs[0].event, "NameRegistered");
         assert.equal(tx.logs[0].args.name, "newname");
@@ -105,7 +105,7 @@ contract('ETHRegistrarController', function (accounts) {
 
         await evm.advanceTime((await controller.minCommitmentAge()).toNumber());
         var balanceBefore = await web3.eth.getBalance(controller.address);
-        var tx = await controller.registerWithConfig("newconfigname", registrantAccount, 28 * DAYS, secret, resolver.address, registrantAccount, {value: 28 * DAYS + 1, gasPrice: 0});
+        var tx = await controller.registerWithConfig("newconfigname", registrantAccount, 28 * DAYS, secret, resolver.address, registrantAccount, {value: 28 * DAYS + 1});
         assert.equal(tx.logs.length, 1);
         assert.equal(tx.logs[0].event, "NameRegistered");
         assert.equal(tx.logs[0].args.name, "newconfigname");
@@ -129,7 +129,7 @@ contract('ETHRegistrarController', function (accounts) {
 
         await evm.advanceTime((await controller.minCommitmentAge()).toNumber());
         var balanceBefore = await web3.eth.getBalance(controller.address);
-        var tx = await controller.registerWithConfig("newconfigname2", registrantAccount, 28 * DAYS, secret, resolver.address, NULL_ADDRESS, {value: 28 * DAYS + 1, gasPrice: 0});
+        var tx = await controller.registerWithConfig("newconfigname2", registrantAccount, 28 * DAYS, secret, resolver.address, NULL_ADDRESS, {value: 28 * DAYS + 1});
         assert.equal(tx.logs.length, 1);
         assert.equal(tx.logs[0].event, "NameRegistered");
         assert.equal(tx.logs[0].args.name, "newconfigname2");
@@ -146,23 +146,23 @@ contract('ETHRegistrarController', function (accounts) {
 
         await evm.advanceTime((await controller.minCommitmentAge()).toNumber());
         var balanceBefore = await web3.eth.getBalance(controller.address);
-        await exceptions.expectFailure(controller.register("newname2", registrantAccount, 28 * DAYS, secret, {value: 28 * DAYS, gasPrice: 0}));
+        await exceptions.expectFailure(controller.register("newname2", registrantAccount, 28 * DAYS, secret, {value: 28 * DAYS}));
     });
 
     it('should reject duplicate registrations', async () => {
         await controller.commit(await controller.makeCommitment("newname", registrantAccount, secret));
 
         await evm.advanceTime((await controller.minCommitmentAge()).toNumber());
         var balanceBefore = await web3.eth.getBalance(controller.address);
-        await exceptions.expectFailure(controller.register("newname", registrantAccount, 28 * DAYS, secret, {value: 28 * DAYS, gasPrice: 0}));
+        await exceptions.expectFailure(controller.register("newname", registrantAccount, 28 * DAYS, secret, {value: 28 * DAYS}));
     });
 
     it('should reject for expired commitments', async () => {
         await controller.commit(await controller.makeCommitment("newname2", registrantAccount, secret));
 
         await evm.advanceTime((await controller.maxCommitmentAge()).toNumber() + 1);
         var balanceBefore = await web3.eth.getBalance(controller.address);
-        await exceptions.expectFailure(controller.register("newname2", registrantAccount, 28 * DAYS, secret, {value: 28 * DAYS, gasPrice: 0}));
+        await exceptions.expectFailure(controller.register("newname2", registrantAccount, 28 * DAYS, secret, {value: 28 * DAYS}));
     });
 
     it('should allow anyone to renew a name', async () => {
@@ -179,7 +179,7 @@ contract('ETHRegistrarController', function (accounts) {
     });
 
     it('should allow the registrar owner to withdraw funds', async () => {
-        await controller.withdraw({gasPrice: 0, from: ownerAccount});
+        await controller.withdraw({from: ownerAccount});
         assert.equal(await web3.eth.getBalance(controller.address), 0);
     });
 });