Skip to content

Commit 390e1b8

Browse files
authored
chore: Replace TSLint with ESLint in contracts/zeroex (#587)
* replace tslint with eslint * config file * fix linting errors * changelog * prettier
1 parent 5645e87 commit 390e1b8

File tree

7 files changed

+47
-33
lines changed

7 files changed

+47
-33
lines changed

contracts/zero-ex/.eslintrc

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"env": {
3+
"es2021": true,
4+
"node": true
5+
},
6+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
7+
"overrides": [],
8+
"parser": "@typescript-eslint/parser",
9+
"parserOptions": {
10+
"project": "./tsconfig.json",
11+
"ecmaVersion": "latest",
12+
"sourceType": "module"
13+
},
14+
"plugins": ["@typescript-eslint"],
15+
"ignorePatterns": [
16+
"lib/**/*",
17+
"generated-wrappers/**/*",
18+
"generated-artifacts/**/*",
19+
"test/generated-wrappers/**/*",
20+
"test/generated-artifacts/**/*"
21+
],
22+
"rules": {}
23+
}

contracts/zero-ex/CHANGELOG.json

+9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
[
2+
{
3+
"version": "0.37.5",
4+
"changes": [
5+
{
6+
"note": "Migrate from TSLint to ESLint and fix linting errors",
7+
"pr": 587
8+
}
9+
]
10+
},
211
{
312
"timestamp": 1663786955,
413
"version": "0.37.4",

contracts/zero-ex/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"watch": "sol-compiler -w",
2525
"clean": "shx rm -rf lib test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
2626
"generate_contract_wrappers": "abi-gen --debug --abis ${npm_package_config_abis} --output test/generated-wrappers --backend ethers",
27-
"lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
28-
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-wrappers/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
27+
"lint": "eslint src test scripts && yarn lint-contracts",
28+
"fix": "eslint --fix src scripts test && yarn lint-contracts",
2929
"coverage:report:text": "istanbul report text",
3030
"coverage:report:html": "istanbul report html && open coverage/index.html",
3131
"profiler:report:html": "istanbul report html && open coverage/index.html",
@@ -65,7 +65,10 @@
6565
"@0x/order-utils": "^10.4.28",
6666
"@0x/sol-compiler": "^4.8.2",
6767
"@0x/ts-doc-gen": "^0.0.28",
68-
"@0x/tslint-config": "^4.1.4",
68+
"@typescript-eslint/eslint-plugin": "^5.38.0",
69+
"@typescript-eslint/parser": "^5.38.0",
70+
"eslint": "^8.23.1",
71+
"eslint-config-prettier": "^8.5.0",
6972
"@typechain/ethers-v5": "^10.0.0",
7073
"@types/isomorphic-fetch": "^0.0.35",
7174
"@types/lodash": "4.14.104",
@@ -79,7 +82,6 @@
7982
"shx": "^0.2.2",
8083
"solhint": "^1.4.1",
8184
"truffle": "^5.0.32",
82-
"tslint": "5.11.0",
8385
"typechain": "^8.0.0",
8486
"typedoc": "~0.16.11",
8587
"typescript": "4.6.3"

contracts/zero-ex/scripts/rollback.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ async function getMainnetContractAsync(): Promise<wrappers.IZeroExContract> {
386386
const proxyFunctions = await querySubgraphAsync();
387387
const deployments = reconstructDeployments(proxyFunctions);
388388

389-
while (true) {
389+
for (;;) {
390390
const { action } = await prompts({
391391
type: 'select',
392392
name: 'action',

contracts/zero-ex/test/features/multiplex_test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ blockchainTests.resets('MultiplexFeature', env => {
294294
};
295295
}
296296

297-
function getUniswapV2MultiHopSubcall(tokens: string[], isSushi: boolean = false): MultiHopSellSubcall {
297+
function getUniswapV2MultiHopSubcall(tokens: string[], isSushi = false): MultiHopSellSubcall {
298298
const uniswapDataEncoder = AbiEncoder.create([
299299
{ name: 'tokens', type: 'address[]' },
300300
{ name: 'isSushi', type: 'bool' },
@@ -307,7 +307,7 @@ blockchainTests.resets('MultiplexFeature', env => {
307307
function getUniswapV2BatchSubcall(
308308
tokens: string[],
309309
sellAmount: BigNumber = getRandomInteger(1, toBaseUnitAmount(1)),
310-
isSushi: boolean = false,
310+
isSushi = false,
311311
): BatchSellSubcall {
312312
return {
313313
...getUniswapV2MultiHopSubcall(tokens, isSushi),

contracts/zero-ex/test/utils/orders.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ interface RfqOrderFilledAmounts {
3434
makerTokenFilledAmount: BigNumber;
3535
takerTokenFilledAmount: BigNumber;
3636
}
37-
interface OtcOrderFilledAmounts extends RfqOrderFilledAmounts {}
37+
type OtcOrderFilledAmounts = RfqOrderFilledAmounts;
3838

3939
interface LimitOrderFilledAmounts {
4040
makerTokenFilledAmount: BigNumber;
@@ -52,7 +52,7 @@ export class NativeOrdersTestEnvironment {
5252
public static async createAsync(
5353
env: BlockchainTestsEnvironment,
5454
gasPrice: BigNumber = new BigNumber('123e9'),
55-
protocolFeeMultiplier: number = 70e3,
55+
protocolFeeMultiplier = 70e3,
5656
): Promise<NativeOrdersTestEnvironment> {
5757
const [owner, maker, taker] = await env.getAccountAddressesAsync();
5858
const [makerToken, takerToken] = await Promise.all(
@@ -153,7 +153,7 @@ export class NativeOrdersTestEnvironment {
153153
order: OtcOrder,
154154
fillAmount: BigNumber | number = order.takerAmount,
155155
taker: string = this.taker,
156-
unwrapWeth: boolean = false,
156+
unwrapWeth = false,
157157
): Promise<TransactionReceiptWithDecodedLogs> {
158158
await this.prepareBalancesForOrdersAsync([order], taker);
159159
if (unwrapWeth) {
@@ -179,7 +179,7 @@ export class NativeOrdersTestEnvironment {
179179
order: OtcOrder,
180180
origin: string = order.txOrigin,
181181
taker: string = order.taker,
182-
unwrapWeth: boolean = false,
182+
unwrapWeth = false,
183183
): Promise<TransactionReceiptWithDecodedLogs> {
184184
await this.prepareBalancesForOrdersAsync([order], taker);
185185
if (unwrapWeth) {
@@ -354,7 +354,7 @@ export function assertOrderInfoEquals(actual: OrderInfo, expected: OrderInfo): v
354354
/**
355355
* Creates an order expiry field.
356356
*/
357-
export function createExpiry(deltaSeconds: number = 60): BigNumber {
357+
export function createExpiry(deltaSeconds = 60): BigNumber {
358358
return new BigNumber(Math.floor(Date.now() / 1000) + deltaSeconds);
359359
}
360360

yarn.lock

+1-21
Original file line numberDiff line numberDiff line change
@@ -5359,26 +5359,11 @@ [email protected], bigi@^1.1.0:
53595359
resolved "https://registry.yarnpkg.com/bigi/-/bigi-1.4.2.tgz#9c665a95f88b8b08fc05cfd731f561859d725825"
53605360
integrity sha512-ddkU+dFIuEIW8lE7ZwdIAf2UPoM90eaprg5m3YXAVVTmKlqV/9BX4A2M8BOK2yOq6/VgZFVhK6QAxJebhlbhzw==
53615361

5362-
5363-
version "7.2.1"
5364-
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f"
5365-
integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==
5366-
5367-
bignumber.js@^9.0.0, bignumber.js@^9.0.1:
5362+
[email protected], bignumber.js@^9.0.0, bignumber.js@^9.0.1, bignumber.js@^9.0.2, bignumber.js@~4.1.0, bignumber.js@~9.0.0, bignumber.js@~9.0.2:
53685363
version "9.1.0"
53695364
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62"
53705365
integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==
53715366

5372-
bignumber.js@~4.1.0:
5373-
version "4.1.0"
5374-
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
5375-
integrity sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==
5376-
5377-
bignumber.js@~9.0.0, bignumber.js@~9.0.2:
5378-
version "9.0.2"
5379-
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673"
5380-
integrity sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==
5381-
53825367
binary-extensions@^2.0.0:
53835368
version "2.2.0"
53845369
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -16941,11 +16926,6 @@ typescript-tuple@^2.2.1:
1694116926
dependencies:
1694216927
typescript-compare "^0.0.2"
1694316928

16944-
typescript@*:
16945-
version "4.8.3"
16946-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
16947-
integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
16948-
1694916929
1695016930
version "3.7.7"
1695116931
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.7.tgz#c931733e2ec10dda56b855b379cc488a72a81199"

0 commit comments

Comments
 (0)