Merge pull request #3517 from ethereum/fix_tests_accounts

Fix generating unit-tests accounts  lib

apps/remix-ide/src/app/tabs/test-tab.js

@@ -110,6 +110,8 @@ module.exports = class TestTab extends ViewPlugin {
   */
   async testFromSource (content, path = 'browser/unit_test.sol') {
     const web3 = await this.call('blockchain', 'web3VM')
+    await this.testRunner.init(web3)
+    await this.createTestLibs()
     return new Promise((resolve, reject) => {
       const runningTest = {}
       runningTest[path] = { content }
@@ -127,9 +129,7 @@ module.exports = class TestTab extends ViewPlugin {
         resolve(result)
       }, (url, cb) => {
         return this.contentImport.resolveAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message))
-      }, {
-        web3
-      })
+      }, {})
     })
   }
 

libs/remix-tests/sol/tests_accounts.sol.ts

@@ -5,7 +5,6 @@ pragma solidity >=0.4.22 <0.9.0;
 library TestsAccounts {
     function getAccount(uint index) pure public returns (address) {
         >accounts<
-        return accounts[index];
     }
 }
 `

libs/remix-tests/src/compiler.ts

@@ -16,13 +16,16 @@ function regexIndexOf (inputString: string, regex: RegExp, startpos = 0) {
 
 export function writeTestAccountsContract (accounts: string[]) {
   const testAccountContract = require('../sol/tests_accounts.sol') // eslint-disable-line
-  let body = `address[${accounts.length}] memory accounts;`
-  if (!accounts.length) body += ';'
-  else {
+  let body = ''
+  if (accounts.length) {
+    body = `address[${accounts.length}] memory accounts;`
     accounts.map((address, index) => {
       body += `\n\t\taccounts[${index}] = ${address};\n`
     })
-  }
+    body += `return accounts[index];`
+  } else {
+    body = `return address(0);`
+  }  
   return testAccountContract.replace('>accounts<', body)
 }
 

libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx

@@ -557,6 +557,9 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
         const compilerData = await testTab.call('compilerArtefacts', 'getCompilerAbstract', file)
         await testTab.call('compilerArtefacts', 'addResolvedContract', contractAddress, compilerData)
       }
+
+      await testTab.testRunner.init(await testTab.call('blockchain', 'web3VM'))
+      await testTab.createTestLibs()
       testTab.testRunner.runTestSources(
         runningTests,
         compilerConfig,
@@ -568,7 +571,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
           callback(error)
         }, (url: string, cb: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
           return testTab.contentImport.resolveAndSave(url).then((result: any) => cb(null, result)).catch((error: Error) => cb(error.message)) // eslint-disable-line @typescript-eslint/no-explicit-any
-        }, { testFilePath: testFilePath, web3: await testTab.call('blockchain', 'web3VM') }
+        }, { testFilePath: testFilePath }
       )
     }).catch((error: Error) => {
       console.log(error)