chore: refactor typings import

Signed-off-by: Jawad Tariq <[email protected]>
topos-protocol · Mar 5, 2024 · ad04153 · ad04153
1 parent 8b8922f
commit ad04153
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 29 deletions.
diff --git a/scripts/const-addr-deployer.ts b/scripts/const-addr-deployer.ts
@@ -8,7 +8,7 @@ import {
   Wallet,
 } from 'ethers'
 
-import { ConstAddressDeployer__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/ConstAddressDeployer__factory'
+import { ConstAddressDeployer__factory } from '../typechain-types/ethers-v6'
 
 export type Arg = string | number
 

diff --git a/scripts/deploy-subnet-registrator.ts b/scripts/deploy-subnet-registrator.ts
@@ -1,7 +1,7 @@
 import { computeAddress, isHexString, JsonRpcProvider, Wallet } from 'ethers'
 
 import subnetRegistratorJSON from '../artifacts/contracts/topos-core/SubnetRegistrator.sol/SubnetRegistrator.json'
-import { SubnetRegistrator__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/SubnetRegistrator__factory'
+import { SubnetRegistrator__factory } from '../typechain-types/ethers-v6'
 import { Arg, deployContractConstant } from './const-addr-deployer'
 
 const main = async function (..._args: Arg[]) {

diff --git a/scripts/deploy-topos-core.ts b/scripts/deploy-topos-core.ts
@@ -1,8 +1,10 @@
 import { isHexString, JsonRpcProvider, Wallet } from 'ethers'
 
-import { ToposCore__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/ToposCore__factory'
-import { ToposCoreProxy__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/ToposCoreProxy__factory'
-import { ToposCore } from '../typechain-types/ethers-v6/contracts/topos-core/ToposCore'
+import {
+  ToposCore,
+  ToposCore__factory,
+  ToposCoreProxy__factory,
+} from '../typechain-types/ethers-v6'
 
 const main = async function (...args: string[]) {
   const [_providerEndpoint, _sequencerPrivateKey, _gasLimit] = args

diff --git a/scripts/deploy-topos-msg-protocol-dynamic.ts b/scripts/deploy-topos-msg-protocol-dynamic.ts
@@ -1,10 +1,12 @@
 import { isHexString, JsonRpcProvider, Wallet } from 'ethers'
 
-import { TokenDeployer__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/TokenDeployer__factory'
-import { ToposCore__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/ToposCore__factory'
-import { ToposCoreProxy__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/ToposCoreProxy__factory'
-import { ERC20Messaging__factory } from '../typechain-types/ethers-v6/factories/contracts/examples/ERC20Messaging__factory'
-import { ToposCore } from '../typechain-types/ethers-v6/contracts/topos-core/ToposCore'
+import {
+  ERC20Messaging__factory,
+  TokenDeployer__factory,
+  ToposCore__factory,
+  ToposCoreProxy__factory,
+  ToposCore,
+} from '../typechain-types/ethers-v6'
 
 const main = async function (...args: string[]) {
   const [providerEndpoint, _sequencerPrivateKey] = args

diff --git a/scripts/deploy-topos-msg-protocol.ts b/scripts/deploy-topos-msg-protocol.ts
@@ -10,8 +10,7 @@ import {
   deployContractConstant,
   predictContractConstant,
 } from './const-addr-deployer'
-import { ToposCore__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/ToposCore__factory'
-import { ToposCore } from '../typechain-types/ethers-v6/contracts/topos-core/ToposCore'
+import { ToposCore__factory, ToposCore } from '../typechain-types/ethers-v6'
 
 const main = async function (...args: string[]) {
   const [providerEndpoint, _sequencerPrivateKey] = args

diff --git a/scripts/register-subnet.ts b/scripts/register-subnet.ts
@@ -1,7 +1,9 @@
 import { isHexString, JsonRpcProvider, Wallet } from 'ethers'
 
-import { SubnetRegistrator__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/SubnetRegistrator__factory'
-import { SubnetRegistrator } from '../typechain-types/ethers-v6/contracts/topos-core/SubnetRegistrator'
+import {
+  SubnetRegistrator,
+  SubnetRegistrator__factory,
+} from '../typechain-types/ethers-v6'
 
 const main = async function (...args: string[]) {
   const [

diff --git a/scripts/test/send-token.ts b/scripts/test/send-token.ts
@@ -1,7 +1,10 @@
 import { isHexString, JsonRpcProvider, Wallet } from 'ethers'
-import { ERC20Messaging__factory } from '../../typechain-types/ethers-v6/factories/contracts/examples/ERC20Messaging__factory'
-import { BurnableMintableCappedERC20__factory } from '../../typechain-types/ethers-v6/factories/contracts/topos-core/BurnableMintableCappedERC20__factory'
-import { ERC20Messaging } from '../../typechain-types/ethers-v6/contracts/examples/ERC20Messaging'
+
+import {
+  BurnableMintableCappedERC20__factory,
+  ERC20Messaging,
+  ERC20Messaging__factory,
+} from '../../typechain-types/ethers-v6'
 import * as cc from '../../test/topos-core/shared/constants/certificates'
 import * as tc from '../../test/topos-core/shared/constants/tokens'
 import * as testUtils from '../../test/topos-core/shared/utils/common'

diff --git a/scripts/upgrade-topos-core.ts b/scripts/upgrade-topos-core.ts
@@ -8,8 +8,10 @@ import {
   Wallet,
 } from 'ethers'
 
-import { ToposCore__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/ToposCore__factory'
-import { CodeHash__factory } from '../typechain-types/ethers-v6/factories/contracts/topos-core/CodeHash__factory'
+import {
+  ToposCore__factory,
+  CodeHash__factory,
+} from '../typechain-types/ethers-v6'
 
 import toposCoreJSON from '../artifacts/contracts/topos-core/ToposCore.sol/ToposCore.json'
 

diff --git a/test/topos-core/BurnableMintableCappedERC20.test.ts b/test/topos-core/BurnableMintableCappedERC20.test.ts
@@ -2,8 +2,10 @@ import { EventLog } from 'ethers'
 import { expect } from 'chai'
 import { ethers } from 'hardhat'
 
-import { BurnableMintableCappedERC20__factory } from '../../typechain-types/ethers-v6/factories/contracts/topos-core/BurnableMintableCappedERC20__factory'
-import { TokenDeployer__factory } from '../../typechain-types/ethers-v6/factories/contracts/topos-core/TokenDeployer__factory'
+import {
+  BurnableMintableCappedERC20__factory,
+  TokenDeployer__factory,
+} from '../../typechain-types/ethers-v6'
 import * as tc from './shared/constants/tokens'
 
 describe('BurnableMintableCappedERC20', () => {

diff --git a/test/topos-core/Bytes32Sets.test.ts b/test/topos-core/Bytes32Sets.test.ts
@@ -1,8 +1,10 @@
 import { ethers } from 'hardhat'
 import { expect } from 'chai'
 
-import { Bytes32SetsTest__factory } from '../../typechain-types/ethers-v6/factories/contracts/topos-core/Bytes32Sets.sol/Bytes32SetsTest__factory'
-import { Bytes32SetsTest } from '../../typechain-types/ethers-v6/contracts/topos-core/Bytes32Sets.sol/Bytes32SetsTest'
+import {
+  Bytes32SetsTest,
+  Bytes32SetsTest__factory,
+} from '../../typechain-types/ethers-v6'
 
 describe('Bytes32Sets', () => {
   let bytes32SetsTest: Bytes32SetsTest

diff --git a/test/topos-core/SubnetRegistrator.test.ts b/test/topos-core/SubnetRegistrator.test.ts
@@ -2,8 +2,10 @@ import { Signer } from 'ethers'
 import { ethers } from 'hardhat'
 import { expect } from 'chai'
 
-import { SubnetRegistrator__factory } from '../../typechain-types/ethers-v6/factories/contracts/topos-core/SubnetRegistrator__factory'
-import { SubnetRegistrator } from '../../typechain-types/ethers-v6'
+import {
+  SubnetRegistrator__factory,
+  SubnetRegistrator,
+} from '../../typechain-types/ethers-v6'
 
 describe('SubnetRegistrator', () => {
   const chainId = 1

diff --git a/test/topos-core/ToposCore.test.ts b/test/topos-core/ToposCore.test.ts
@@ -2,10 +2,13 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers'
 import { ethers } from 'hardhat'
 import { expect } from 'chai'
 
-import { ToposCore__factory } from '../../typechain-types/ethers-v6/factories/contracts/topos-core/ToposCore__factory'
-import { ToposCoreProxy__factory } from '../../typechain-types/ethers-v6/factories/contracts/topos-core/ToposCoreProxy__factory'
-import { CodeHash__factory } from '../../typechain-types/ethers-v6/factories/contracts/topos-core/CodeHash__factory'
-import { ToposCoreProxy } from '../../typechain-types/ethers-v6/contracts/topos-core/ToposCoreProxy'
+import {
+  CodeHash__factory,
+  ToposCore__factory,
+  ToposCoreProxy,
+  ToposCoreProxy__factory,
+} from '../../typechain-types/ethers-v6'
+
 import * as cc from './shared/constants/certificates'
 import * as testUtils from './shared/utils/common'