Refactor voucher tests file (#18)

iExecBlockchainComputing · May 23, 2024 · f37033e · f37033e
2 parents 86a5133 + 295037d
commit f37033e
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 204 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## vNEXT
+- Refactor voucher tests file. (#18)
 - Use real poco address if available at deployment. (#17)
 - Match orders boost through voucher. (#16)
 - Use hardhat deploy. (#15)

diff --git a/scripts/common.ts b/scripts/common.ts
@@ -1,8 +1,6 @@
 import { ContractTransactionReceipt } from 'ethers';
 import { ethers } from 'hardhat';
-import { Voucher, VoucherProxy } from '../../typechain-types';
-import { VoucherV2Mock } from '../../typechain-types/contracts/mocks';
-
+import { Voucher, VoucherProxy, VoucherV2Mock } from '../typechain-types';
 
 export async function getVoucher(voucherAddress: string): Promise<Voucher> {
     return await ethers.getContractAt('Voucher', voucherAddress);
@@ -20,14 +18,9 @@ export async function getExpectedExpiration(
     voucherDuration: number,
     txReceipt: ContractTransactionReceipt | null,
 ): Promise<number> {
-    if (txReceipt != null) {
-        const block = await ethers.provider.getBlock(txReceipt.blockNumber);
-        if (block) {
-            return block.timestamp + voucherDuration;
-        } else {
-            return 0;
-        }
-    } else {
+    if (!txReceipt) {
         return 0;
     }
+    const block = await ethers.provider.getBlock(txReceipt.blockNumber);
+    return block ? block.timestamp + voucherDuration : 0;
 }