chore: ST unit tests:: explicit revert reason checks

test/f_ether_dividends.js

@@ -350,8 +350,7 @@ contract("EtherDividendCheckpoint", async (accounts) => {
 
         it("Should not allow reclaiming withholding tax with incorrect index", async () => {
             await catchRevert(
-                I_EtherDividendCheckpoint.withdrawWithholding(300, { from: token_owner, gasPrice: 0 }),
-                "tx -> failed because dividend index is not valid"
+                I_EtherDividendCheckpoint.withdrawWithholding(300, { from: token_owner, gasPrice: 0 })
             );
         });
 
@@ -580,8 +579,7 @@ contract("EtherDividendCheckpoint", async (accounts) => {
                 I_EtherDividendCheckpoint.createDividendWithCheckpointAndExclusions(maturity, expiry, 4, addresses, dividendName, {
                     from: token_owner,
                     value: new BN(web3.utils.toWei("10", "ether"))
-                }),
-                "tx -> failed because too many address excluded"
+                })
             );
         });
 

test/helpers/exceptions.js

@@ -1,29 +1,19 @@
-const PREFIX = "VM Exception while processing transaction: ";
-const PREFIX2 = "Returned error: VM Exception while processing transaction: ";
-
-async function tryCatch(promise, message) {
+async function tryCatch(promise, expectedError) {
     try {
         await promise;
-        throw null;
     } catch (error) {
-        assert(error, "Expected an error but did not get one");
-        try {
-            assert(
-                error.message.startsWith(PREFIX + message),
-                "Expected an error starting with '" + PREFIX + message + "' but got '" + error.message + "' instead"
-            );
-        } catch (err) {
-            assert(
-                error.message.startsWith(PREFIX2 + message),
-                "Expected an error starting with '" + PREFIX + message + "' but got '" + error.message + "' instead"
-            );
+        if (error.message.indexOf(expectedError) === -1) {
+        throw Error(`Wrong failure type, expected '${expectedError}' and got '${error.message}'`);
         }
+        return;
     }
+
+    throw Error('Expected failure not received');
 }
 
 module.exports = {
-    catchRevert: async function(promise) {
-        await tryCatch(promise, "revert");
+    catchRevert: async function(promise, message = 'revert') {
+        await tryCatch(promise, message);
     },
     catchPermission: async function(promise) {
         await tryCatch(promise, "revert Permission check failed");

test/k_module_registry.js

@@ -155,8 +155,7 @@ contract("ModuleRegistry", async (accounts) => {
             catchRevert(
                 I_ModuleRegistryProxy.upgradeToAndCall("1.0.0", I_ModuleRegistry.address, bytesProxy, {
                     from: account_polymath
-                }),
-                "tx-> revert because polymathRegistry address is 0x"
+                })
             );
         });
 
@@ -165,8 +164,7 @@ contract("ModuleRegistry", async (accounts) => {
             catchRevert(
                 I_ModuleRegistryProxy.upgradeToAndCall("1.0.0", I_ModuleRegistry.address, bytesProxy, {
                     from: account_polymath
-                }),
-                "tx-> revert because owner address is 0x"
+                })
             );
         });
 
@@ -175,8 +173,7 @@ contract("ModuleRegistry", async (accounts) => {
             catchRevert(
                 I_ModuleRegistryProxy.upgradeToAndCall("1.0.0", I_ModuleRegistry.address, bytesProxy, {
                     from: account_polymath
-                }),
-                "tx-> revert because all params are 0x"
+                })
             );
         });