Create reading tool

eldiosman · Feb 8, 2021 · 5d90a1b · 5d90a1b
1 parent c9aba14
commit 5d90a1b
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 70 deletions.
diff --git a/changelog/infrastructure.md b/changelog/infrastructure.md
@@ -15,6 +15,8 @@ components, the logs will have the following format:
 
 ### Added
 
+- reading-tool for reading test config.
+
 ### Fixed
 
 ## Release 2021-02-02

diff --git a/core/tests/ts-tests/tests/helpers.ts b/core/tests/ts-tests/tests/helpers.ts
diff --git a/core/tests/ts-tests/tests/withdrawal-helpers.test.ts b/core/tests/ts-tests/tests/withdrawal-helpers.test.ts
@@ -5,7 +5,7 @@ import './priority-ops';
 import './change-pub-key';
 import './withdrawal-helpers';
 
-import { loadTestConfig } from './helpers';
+import { loadTestConfig } from '../../../../etc/reading-tool';
 
 const TX_AMOUNT = utils.parseEther('1');
 const DEPOSIT_AMOUNT = TX_AMOUNT.mul(200);

diff --git a/core/tests/ts-tests/tests/withdrawal-helpers.ts b/core/tests/ts-tests/tests/withdrawal-helpers.ts
@@ -3,9 +3,10 @@ import { expect } from 'chai';
 import { Wallet, types, Provider, utils } from 'zksync';
 import { BigNumber, ethers } from 'ethers';
 import { Address } from 'zksync/build/types';
+import { sleep } from 'zksync/build/utils';
 
 import { RevertReceiveAccountFactory, RevertTransferERC20Factory } from '../../../../contracts/typechain';
-import { waitForOnchainWithdrawal, loadTestConfig } from './helpers';
+import { loadTestConfig } from '../../../../etc/reading-tool';
 
 const TEST_CONFIG = loadTestConfig();
 
@@ -24,6 +25,25 @@ declare module './tester' {
     }
 }
 
+async function waitForOnchainWithdrawal(
+    syncProvider: Provider,
+    hash: string,
+    polling_interval: number = 200,
+    polling_timeout: number = 35000
+): Promise<string | null> {
+    let withdrawalTxHash = null;
+    const polling_iterations = polling_timeout / polling_interval;
+    for (let i = 0; i < polling_iterations; i++) {
+        withdrawalTxHash = await syncProvider.getEthTxForWithdrawal(hash);
+        if (withdrawalTxHash != null) {
+            break;
+        }
+        await sleep(polling_interval);
+    }
+
+    return withdrawalTxHash;
+}
+
 async function setRevertReceive(ethWallet: ethers.Signer, to: Address, value: boolean) {
     const revertReceiveContract = RevertReceiveAccountFactory.connect(to, ethWallet);
 

diff --git a/sdk/zksync.js/tests/helpers.ts → etc/reading-tool.ts b/sdk/zksync.js/tests/helpers.ts → etc/reading-tool.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 
 function configPath(postfix: string) {
-    return `${process.env.ZKSYNC_HOME}/etc/test_config/${postfix}`;
+    return `./test_config/${postfix}`;
 }
 
 function loadConfig(path: string) {
@@ -21,11 +21,15 @@ export function loadTestConfig() {
     const eipConfig = Object.assign(eipConstantConfig, eipVolatileConfig);
 
     const ethConstantPath = configPath('constant/eth.json');
-    let ethConfig = loadConfig(ethConstantPath);
+    const ethConfig = loadConfig(ethConstantPath);
+
+    const withdrawalHelpersConfigPoth = configPath('volatile/withdrawal-helpers.json');
+    const withdrawalHelpersConfig = loadConfig(withdrawalHelpersConfigPoth);
 
     return {
         eip1271: eipConfig,
-        eth: ethConfig
+        eth: ethConfig,
+        withdrawalHelpers: withdrawalHelpersConfig
     };
 }
 
@@ -35,7 +39,7 @@ export function loadTestVectorsConfig() {
 }
 
 export function getTokens(network: string) {
-    const configPath = `${process.env.ZKSYNC_HOME}/etc/tokens/${network}.json`;
+    const configPath = `./tokens/${network}.json`;
     console.log(configPath);
     return JSON.parse(
         fs.readFileSync(configPath, {

diff --git a/sdk/zksync.js/tests/eip1271.test.ts b/sdk/zksync.js/tests/eip1271.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import * as ethers from 'ethers';
-import { loadTestConfig } from './helpers';
+import { loadTestConfig } from '../../../etc/reading-tool';
 import * as zkUtils from '../src/utils';
 
 const testConfig = loadTestConfig();

diff --git a/sdk/zksync.js/tests/provider.test.ts b/sdk/zksync.js/tests/provider.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { Provider } from '../src/provider';
-import { getTokens } from './helpers';
+import { getTokens } from '../../../etc/reading-tool';
 
 describe('Provider tests', function () {
     it('Update token set', async function () {

diff --git a/sdk/zksync.js/tests/vectors.test.ts b/sdk/zksync.js/tests/vectors.test.ts
@@ -13,7 +13,7 @@ import {
     parseHexWithPrefix
 } from '../src/utils';
 import { privateKeyFromSeed, signTransactionBytes } from '../src/crypto';
-import { loadTestVectorsConfig } from './helpers';
+import { loadTestVectorsConfig } from '../../../etc/reading-tool';
 
 const vectors = loadTestVectorsConfig();
 const cryptoPrimitivesVectors = vectors['cryptoPrimitivesTest'];

diff --git a/sdk/zksync.js/tests/wallet.test.ts b/sdk/zksync.js/tests/wallet.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { BigNumber, ethers } from 'ethers';
 import { Wallet } from '../src/wallet';
-import { getTokens } from './helpers';
+import { getTokens } from '../../../etc/reading-tool';
 
 import { Provider } from '../src/provider';