update tests

Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>

Author: fusmanii

.github/actions/generate-evm-artifacts/action.yml

@@ -32,7 +32,7 @@ runs:
       run: npx ts-node scripts/typechainArtifacts.ts
     - name: Generate Typechain
       shell: bash
-      run: npx typechain --target ethers-v5 "typechain-artifacts" --out-dir typechain
+      run: npx typechain --target ethers-v5 "typechain-artifacts/**/*.json" --out-dir typechain
     - name: Archive EVM artifacts (for caching)
       shell: bash
       env:

.gitignore

@@ -32,7 +32,7 @@ zkout
 cache-foundry
 
 # Typechain
-.typechain-artifacts
+typechain-artifacts
 
 # Upgradeability files
 .openzeppelin

test/evm/hardhat/chain-adapters/Arbitrum_Adapter.ts

@@ -27,8 +27,8 @@ import {
   MessagingReceiptStructOutput,
   OFTReceiptStructOutput,
   SendParamStruct,
-} from "../../../../typechain/IOFT.sol/IOFT";
-import { IOFT__factory } from "../../../../typechain/factories/IOFT.sol/IOFT__factory";
+} from "../../../../typechain/IOFT";
+import { IOFT__factory } from "../../../../typechain/factories/IOFT__factory";
 import { hubPoolFixture, enableTokensForLP } from "../fixtures/HubPool.Fixture";
 import { constructSingleChainTree } from "../MerkleLib.utils";
 import { CIRCLE_DOMAIN_IDs } from "../../../../deploy/consts";

test/evm/hardhat/chain-adapters/Polygon_Adapter.ts

@@ -32,8 +32,8 @@ import {
   MessagingReceiptStructOutput,
   OFTReceiptStructOutput,
   SendParamStruct,
-} from "../../../../typechain/IOFT.sol/IOFT";
-import { IOFT__factory } from "../../../../typechain/factories/IOFT.sol/IOFT__factory";
+} from "../../../../typechain/IOFT";
+import { IOFT__factory } from "../../../../typechain/factories/IOFT__factory";
 import { CIRCLE_DOMAIN_IDs } from "../../../../deploy/consts";
 import { AdapterStore, AdapterStore__factory } from "../../../../typechain";
 import { CHAIN_IDs } from "@across-protocol/constants";

test/evm/hardhat/chain-specific-spokepools/Arbitrum_SpokePool.ts

@@ -26,8 +26,8 @@ import {
   MessagingReceiptStructOutput,
   OFTReceiptStructOutput,
   SendParamStruct,
-} from "../../../../typechain/IOFT.sol/IOFT";
-import { IOFT__factory } from "../../../../typechain/factories/IOFT.sol/IOFT__factory";
+} from "../../../../typechain/IOFT";
+import { IOFT__factory } from "../../../../typechain/factories/IOFT__factory";
 import { CHAIN_IDs } from "@across-protocol/constants";
 
 let hubPool: Contract, arbitrumSpokePool: Contract, dai: Contract, weth: Contract, l2UsdtContract: Contract;

test/evm/hardhat/chain-specific-spokepools/Polygon_SpokePool.ts

@@ -25,13 +25,13 @@ import {
 } from "../../../../utils/utils";
 import { getOftEid } from "../../../../utils/utils";
 import { CHAIN_IDs } from "@across-protocol/constants";
-import { IOFT__factory } from "../../../../typechain/factories/IOFT.sol/IOFT__factory";
+import { IOFT__factory } from "../../../../typechain/factories/IOFT__factory";
 import {
   MessagingFeeStructOutput,
   MessagingReceiptStructOutput,
   OFTReceiptStructOutput,
   SendParamStruct,
-} from "../../../../typechain/IOFT.sol/IOFT";
+} from "../../../../typechain/IOFT";
 import { hre } from "../../../../utils/utils.hre";
 import { hubPoolFixture } from "../fixtures/HubPool.Fixture";
 import { buildRelayerRefundLeaves, buildRelayerRefundTree, constructSingleRelayerRefundTree } from "../MerkleLib.utils";