Fix tests

CirclesUBI · Aug 22, 2023 · c3a7139 · c3a7139
1 parent 7fba17f
commit c3a7139
Show file tree

Hide file tree

Showing 6 changed files with 153 additions and 228 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -9,7 +9,7 @@ module.exports = {
   },
   modulePathIgnorePatterns: ['<rootDir>/test/helpers'],
   testEnvironment: 'node',
-  testMatch: ['**/safe.test.js'],
-  testTimeout: 360 * 1000,
+  testMatch: ['**/safe.test.js', '**/trust.test.js'],
+  testTimeout: 30 * 1000,
   verbose: true,
 };
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "docs:serve": "documentation serve --watch ./src/**",
     "docs:lint": "documentation lint ./src/**",
     "lint": "eslint --ignore-path .gitignore --ignore-pattern lib .",
-    "test": "jest --runInBand",
+    "test": "jest",
     "test:watch": "npm run test -- --watch"
   },
   "devDependencies": {

diff --git a/test/helpers/addTrust.js b/test/helpers/addTrust.js
diff --git a/test/helpers/setupAccount.js b/test/helpers/setupAccount.js
@@ -12,18 +12,17 @@ export default async function setupAccount({ account, nonce }, core) {
       safeMasterAddress,
     },
     safe,
+    utils,
     web3,
   } = core;
   const safeAddress = await safe.predictAddress(account, { nonce });
   let safeSdk;
 
   return (
     // Deploy manually a Safe
-    web3.eth
+    utils
       .sendTransaction({
-        from: account.address,
-        to: proxyFactoryAddress,
-        value: 0,
+        target: proxyFactoryAddress,
         data: proxyFactory.methods
           .createProxyWithNonce(
             safeMasterAddress,
@@ -60,10 +59,8 @@ export default async function setupAccount({ account, nonce }, core) {
       .then((safeTx) => safeSdk.signTransaction(safeTx))
       // Execute manually the transaction
       .then((signedSafeTx) =>
-        web3.eth.sendTransaction({
-          from: account.address,
-          to: safeAddress,
-          value: 0,
+        utils.sendTransaction({
+          target: safeAddress,
           data: getSafeContract(web3, safeAddress)
             .methods.execTransaction(
               signedSafeTx.data.to,

diff --git a/test/safe.test.js b/test/safe.test.js
@@ -7,8 +7,6 @@ import { deployCRCVersionSafe } from './helpers/transactions';
 import generateSaltNonce from './helpers/generateSaltNonce';
 import setupAccount from './helpers/setupAccount';
 import setupWeb3 from './helpers/setupWeb3';
-// Temporary method for adding trusts with new relayer since trusts functionality is not yet migrated
-import addTrust from './helpers/addTrust';
 
 describe('Safe', () => {
   const { web3, provider } = setupWeb3();
@@ -41,15 +39,10 @@ describe('Safe', () => {
       // Let's make the trust connections needed to get the Safe deployed
       await Promise.all(
         predeployedSafes.map((predeployedAddress, index) =>
-          addTrust(
-            {
-              account: accounts[index + 1],
-              safeAddress: predeployedAddress,
-              safeAddressToTrust: safeAddress,
-              limitPercentage: 50,
-            },
-            core,
-          ),
+          core.trust.addConnection(accounts[index + 1], {
+            canSendTo: predeployedAddress,
+            user: safeAddress,
+          }),
         ),
       );
 
@@ -94,15 +87,10 @@ describe('Safe', () => {
       // Let's make the trust connections needed to get the Safe deployed
       await Promise.all(
         predeployedSafes.map((predeployedAddress, index) =>
-          addTrust(
-            {
-              account: accounts[index + 1],
-              safeAddress: predeployedAddress,
-              safeAddressToTrust: safeAddress,
-              limitPercentage: 50,
-            },
-            core,
-          ),
+          core.trust.addConnection(accounts[index + 1], {
+            canSendTo: predeployedAddress,
+            user: safeAddress,
+          }),
         ),
       );