diff --git a/lib/js_service_encointer/test/cantillon.test-e2e.js b/lib/js_service_encointer/test/cantillon.test-e2e.js index 453b6612f..a52fdc60b 100644 --- a/lib/js_service_encointer/test/cantillon.test-e2e.js +++ b/lib/js_service_encointer/test/cantillon.test-e2e.js @@ -28,8 +28,6 @@ describe('cantillon', () => { let worker; beforeAll(async () => { - jest.setTimeout(90000); - const setup = await testSetup(network); keyring = new Keyring({ type: 'sr25519' }); @@ -41,7 +39,7 @@ describe('cantillon', () => { }); window.workerShieldingKey = await worker.getShieldingKey(); window.mrenclave = network.mrenclave; - }); + }, 90000); describe('on-chain', () => { describe('init api', () => { diff --git a/lib/js_service_encointer/test/gesell.test-e2e.js b/lib/js_service_encointer/test/gesell.test-e2e.js index 4215db079..0d861f699 100644 --- a/lib/js_service_encointer/test/gesell.test-e2e.js +++ b/lib/js_service_encointer/test/gesell.test-e2e.js @@ -8,16 +8,13 @@ import account from '../src/service/account'; import { u8aToHex } from '@polkadot/util'; import { gesellNetwork } from './testUtils/networks'; -import { jest } from '@jest/globals'; import { testSetup } from './testUtils/testSetup'; describe('encointer', () => { const network = gesellNetwork(); beforeAll(async () => { - jest.setTimeout(90000); - await testSetup(network); - }); + }, 90000); describe('init api', () => { it('should get gesell genesis hash', async () => { @@ -84,13 +81,12 @@ describe('encointer', () => { describe('sendFaucetTx method', () => { it('should send balance', async () => { - jest.setTimeout(90000); const address = '5DPgv6nn4R1Gi1MUiAnzFDPaKF56SYKD9Zq4Q6REUGLhUZk1'; const Ert001 = 1000000000; const result = await account.sendFaucetTx(address, Ert001); console.log(result); expect(result).toBeDefined(); - }); + }, 90000); }); describe('can transform problematic location', () => { diff --git a/lib/js_service_encointer/test/service/account.test.js b/lib/js_service_encointer/test/service/account.test.js index 8228d7e5d..24eefd1e3 100644 --- a/lib/js_service_encointer/test/service/account.test.js +++ b/lib/js_service_encointer/test/service/account.test.js @@ -7,15 +7,12 @@ import account from '../../src/service/account'; import { cryptoWaitReady } from '@polkadot/util-crypto'; import { gesellNetwork, localDockerNetwork } from '../testUtils/networks'; import { testSetup } from '../testUtils/testSetup'; -import { jest } from '@jest/globals'; import { Keyring } from '@polkadot/api'; describe('account', () => { const network = localDockerNetwork(); let keyring; beforeAll(async () => { - jest.setTimeout(90000); - await testSetup(network); keyring = new Keyring({ type: 'sr25519' }); }); diff --git a/lib/js_service_encointer/test/service/encointer.test.js b/lib/js_service_encointer/test/service/encointer.test.js index 609fb8fac..97d5afd0d 100644 --- a/lib/js_service_encointer/test/service/encointer.test.js +++ b/lib/js_service_encointer/test/service/encointer.test.js @@ -20,11 +20,9 @@ describe('encointer', () => { const network = localDockerNetwork(); let keyring; beforeAll(async () => { - jest.setTimeout(90000); - await testSetup(network); - keyring =new Keyring({ type: 'sr25519' }); - }); + keyring = new Keyring({ type: 'sr25519' }); + }, 90000); describe('getCurrentPhase', () => { it('should return promise', async () => { diff --git a/lib/js_service_encointer/test/service/substratee.test.js b/lib/js_service_encointer/test/service/substratee.test.js index 81e9832e8..0b757513f 100644 --- a/lib/js_service_encointer/test/service/substratee.test.js +++ b/lib/js_service_encointer/test/service/substratee.test.js @@ -4,7 +4,7 @@ 'use strict'; -import { beforeAll, describe, it, jest } from '@jest/globals'; +import { beforeAll, describe, it, } from '@jest/globals'; import { cantillonNetwork, localDockerNetwork } from '../testUtils/networks'; import substratee from '../../src/service/substratee'; @@ -21,10 +21,8 @@ global.window = window; describe.skip('substratee', () => { const network = localDockerNetwork(); beforeAll(async () => { - jest.setTimeout(90000); - await testSetup(network); - }); + }, 90000); it('getEnclave works', async () => { // remember: indexes start at one on-chain