Skip to content

Use import type for types instead of import #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/hardhat-test/hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import '@typechain/hardhat'
import '@nomiclabs/hardhat-ethers'

import { HardhatUserConfig } from 'hardhat/types'
import type { HardhatUserConfig } from 'hardhat/types'

const config: HardhatUserConfig = {
solidity: '0.8.7',
Expand Down
8 changes: 6 additions & 2 deletions packages/hardhat-test/test/hardhat.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Interface } from '@ethersproject/abi'
import type { Interface } from '@ethersproject/abi'
import { ethers } from 'hardhat'
import { AssertTrue, IsExact } from 'test-utils'
import type { AssertTrue, IsExact } from 'test-utils'

import { Counter__factory, StructsInConstructor__factory } from '../typechain-types'
import type { Vector2Struct } from '../typechain-types/StructsInConstructor'
Expand All @@ -20,8 +20,12 @@ describe('TypeChain x Hardhat', () => {
const artifact = require('../artifacts/contracts/Counter.sol/Counter.json') as { abi: Interface; bytecode: string }

const counterFactory1 = new Counter__factory()
counterFactory1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed?

const counterFactory2 = new Counter__factory(deployer)
counterFactory2
const counterFactory3 = new Counter__factory(artifact.abi, artifact.bytecode)
counterFactory3
const counterFactory4 = new Counter__factory(artifact.abi, artifact.bytecode, deployer)
counterFactory4
})
})
3 changes: 2 additions & 1 deletion packages/hardhat-test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"include": ["./typechain-types", "./test", "./hardhat.config.ts"],
"compilerOptions": {
"esModuleInterop": true,
"skipLibCheck": true
"skipLibCheck": true,
"importsNotUsedAsValues": "error"
}
}
17 changes: 13 additions & 4 deletions packages/hardhat-test/typechain-types/Counter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import {
import type {
BaseContract,
BigNumber,
BytesLike,
Expand All @@ -12,9 +12,18 @@ import {
Signer,
utils,
} from "ethers";
import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
import { Listener, Provider } from "@ethersproject/providers";
import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
import type {
FunctionFragment,
Result,
EventFragment,
} from "@ethersproject/abi";
import type { Listener, Provider } from "@ethersproject/providers";
import type {
TypedEventFilter,
TypedEvent,
TypedListener,
OnEvent,
} from "./common";

export interface CounterInterface extends utils.Interface {
contractName: "Counter";
Expand Down
19 changes: 15 additions & 4 deletions packages/hardhat-test/typechain-types/Demo.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { BaseContract, BigNumber, BigNumberish, Signer, utils } from "ethers";

import { Listener, Provider } from "@ethersproject/providers";
import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
import type {
BaseContract,
BigNumber,
BigNumberish,
Signer,
utils,
} from "ethers";

import type { Listener, Provider } from "@ethersproject/providers";
import type {
TypedEventFilter,
TypedEvent,
TypedListener,
OnEvent,
} from "./common";

export declare namespace Demo {
export type Struct1Struct = { a: BigNumberish; b: BigNumberish };
Expand Down
17 changes: 14 additions & 3 deletions packages/hardhat-test/typechain-types/StructsInConstructor.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { BaseContract, BigNumber, BigNumberish, Signer, utils } from "ethers";
import type {
BaseContract,
BigNumber,
BigNumberish,
Signer,
utils,
} from "ethers";

import { Listener, Provider } from "@ethersproject/providers";
import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
import type { Listener, Provider } from "@ethersproject/providers";
import type {
TypedEventFilter,
TypedEvent,
TypedListener,
OnEvent,
} from "./common";

export type Vector2Struct = { x: BigNumberish; y: BigNumberish };

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers";
import { Provider, TransactionRequest } from "@ethersproject/providers";
import { Signer, utils, Contract, ContractFactory } from "ethers";
import type { Overrides } from "ethers";
import type { Provider, TransactionRequest } from "@ethersproject/providers";
import type { Counter, CounterInterface } from "../Counter";

const _abi = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers";
import { Provider, TransactionRequest } from "@ethersproject/providers";
import { Signer, utils, Contract, ContractFactory } from "ethers";
import type { Overrides } from "ethers";
import type { Provider, TransactionRequest } from "@ethersproject/providers";
import type { Demo, DemoInterface } from "../Demo";

const _abi = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers";
import { Provider, TransactionRequest } from "@ethersproject/providers";
import { Signer, utils, Contract, ContractFactory } from "ethers";
import type { Overrides } from "ethers";
import type { Provider, TransactionRequest } from "@ethersproject/providers";
import type {
StructsInConstructor,
StructsInConstructorInterface,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import {
import type {
BaseContract,
BigNumber,
BigNumberish,
Expand All @@ -13,9 +13,18 @@ import {
Signer,
utils,
} from "ethers";
import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
import { Listener, Provider } from "@ethersproject/providers";
import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
import type {
FunctionFragment,
Result,
EventFragment,
} from "@ethersproject/abi";
import type { Listener, Provider } from "@ethersproject/providers";
import type {
TypedEventFilter,
TypedEvent,
TypedListener,
OnEvent,
} from "./common";

export interface ERC20Interface extends utils.Interface {
contractName: "ERC20";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { BaseContract, Signer, utils } from "ethers";

import { Listener, Provider } from "@ethersproject/providers";
import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
import type { BaseContract, Signer, utils } from "ethers";

import type { Listener, Provider } from "@ethersproject/providers";
import type {
TypedEventFilter,
TypedEvent,
TypedListener,
OnEvent,
} from "./common";

export interface EdgeCasesInterface extends utils.Interface {
contractName: "EdgeCases";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import {
import type {
BaseContract,
BigNumber,
BigNumberish,
Expand All @@ -11,9 +11,14 @@ import {
Signer,
utils,
} from "ethers";
import { FunctionFragment, Result } from "@ethersproject/abi";
import { Listener, Provider } from "@ethersproject/providers";
import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
import type { FunctionFragment, Result } from "@ethersproject/abi";
import type { Listener, Provider } from "@ethersproject/providers";
import type {
TypedEventFilter,
TypedEvent,
TypedListener,
OnEvent,
} from "./common";

export interface SafeMathInterface extends utils.Interface {
contractName: "SafeMath";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { BaseContract, Signer, utils } from "ethers";

import { Listener, Provider } from "@ethersproject/providers";
import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
import type { BaseContract, Signer, utils } from "ethers";

import type { Listener, Provider } from "@ethersproject/providers";
import type {
TypedEventFilter,
TypedEvent,
TypedListener,
OnEvent,
} from "./common";

export interface TestContractInterface extends utils.Interface {
contractName: "TestContract";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { BaseContract, Signer, utils } from "ethers";

import { Listener, Provider } from "@ethersproject/providers";
import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
import type { BaseContract, Signer, utils } from "ethers";

import type { Listener, Provider } from "@ethersproject/providers";
import type {
TypedEventFilter,
TypedEvent,
TypedListener,
OnEvent,
} from "./common";

export interface TestContract1Interface extends utils.Interface {
contractName: "TestContract1";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers";
import { Provider, TransactionRequest } from "@ethersproject/providers";
import { Signer, utils, Contract, ContractFactory } from "ethers";
import type { Overrides } from "ethers";
import type { Provider, TransactionRequest } from "@ethersproject/providers";
import type { ERC20, ERC20Interface } from "../ERC20";

const _abi = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import {
utils,
Contract,
ContractFactory,
Overrides,
BytesLike,
BigNumberish,
} from "ethers";
import { Provider, TransactionRequest } from "@ethersproject/providers";
import type { Overrides } from "ethers";
import type { Provider, TransactionRequest } from "@ethersproject/providers";
import type { EdgeCases, EdgeCasesInterface } from "../EdgeCases";

const _abi = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers";
import { Provider, TransactionRequest } from "@ethersproject/providers";
import { Signer, utils, Contract, ContractFactory } from "ethers";
import type { Overrides } from "ethers";
import type { Provider, TransactionRequest } from "@ethersproject/providers";
import type { SafeMath, SafeMathInterface } from "../SafeMath";

const _abi = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import {
Signer,
utils,
Contract,
ContractFactory,
Overrides,
BigNumberish,
} from "ethers";
import { Provider, TransactionRequest } from "@ethersproject/providers";
import { Signer, utils, Contract, ContractFactory, BigNumberish } from "ethers";
import type { Overrides } from "ethers";
import type { Provider, TransactionRequest } from "@ethersproject/providers";
import type { TestContract1, TestContract1Interface } from "../TestContract1";

const _abi = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
/* Autogenerated file. Do not edit manually. */
/* tslint:disable */
/* eslint-disable */
import {
Signer,
utils,
Contract,
ContractFactory,
Overrides,
BigNumberish,
} from "ethers";
import { Provider, TransactionRequest } from "@ethersproject/providers";
import { Signer, utils, Contract, ContractFactory, BigNumberish } from "ethers";
import type { Overrides } from "ethers";
import type { Provider, TransactionRequest } from "@ethersproject/providers";
import type { TestContract, TestContractInterface } from "../TestContract";

const _abi = [
Expand Down
4 changes: 2 additions & 2 deletions packages/target-ethers-v4-test/test/DataTypesInput.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { expect } from 'earljs'
import { BigNumber, formatBytes32String } from 'ethers/utils'
import { AssertTrue, IsExact, q18, typedAssert } from 'test-utils'
import { Awaited } from 'ts-essentials'
import type { Awaited } from 'ts-essentials'

import { DataTypesInput } from '../types/DataTypesInput'
import type { DataTypesInput } from '../types/DataTypesInput'
import { createNewBlockchain, deployContract } from './common'

describe('DataTypesInput', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/target-ethers-v4-test/test/Overload.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { BigNumber } from 'ethers/utils'
import { typedAssert } from 'test-utils'

import { Overloads } from '../types/Overloads'
import type { Overloads } from '../types/Overloads'
import { createNewBlockchain, deployContract } from './common'

describe('Overloads', () => {
Expand Down
3 changes: 2 additions & 1 deletion packages/target-ethers-v4-test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"include": ["src", "test", "types"],
"compilerOptions": {
"esModuleInterop": true,
"skipLibCheck": true // problems in @types/superagent
"skipLibCheck": true, // problems in @types/superagent
"importsNotUsedAsValues": "error"
}
}
4 changes: 2 additions & 2 deletions packages/target-ethers-v4-test/types/factories/B__factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
/* eslint-disable */

import { Contract, Signer } from "ethers";
import { Provider } from "ethers/providers";
import type { Provider } from "ethers/providers";

import { B } from "../B";
import type { B } from "../B";

export class B__factory {
static connect(address: string, signerOrProvider: Signer | Provider): B {
Expand Down
Loading