From e10e8f89fc8eda30ed552d0bd1ceeaca5dd0ff02 Mon Sep 17 00:00:00 2001 From: RcleydsonR Date: Tue, 24 Jan 2023 22:28:24 -0300 Subject: [PATCH] Fix lint issues --- babel.config.js | 17 +- src/blockchain/events.ts | 6 +- .../ListingComponent/ListingComponent.vue | 8 +- .../__tests__/ListingComponent.spec.ts | 2 +- src/model/mock/EventMock.ts | 185 +++++++++--------- src/model/mock/ValidDepositMock.ts | 72 +++---- src/shims-vue.d.ts | 6 +- vite.config.ts | 2 +- 8 files changed, 147 insertions(+), 151 deletions(-) diff --git a/babel.config.js b/babel.config.js index 721082b..42555d7 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,15 +1,18 @@ module.exports = { presets: [ - ['@babel/preset-env', { - modules: false - }], + [ + "@babel/preset-env", + { + modules: false, + }, + ], ], env: { test: { presets: [ - ['@babel/preset-env', {targets: {node: 'current'}}], - '@babel/preset-typescript', + ["@babel/preset-env", { targets: { node: "current" } }], + "@babel/preset-typescript", ], - } + }, }, -} \ No newline at end of file +}; diff --git a/src/blockchain/events.ts b/src/blockchain/events.ts index 4947230..e8caafd 100644 --- a/src/blockchain/events.ts +++ b/src/blockchain/events.ts @@ -18,7 +18,7 @@ const getNetworksLiquidity = async (): Promise => { import.meta.env.VITE_MUMBAI_API_URL, 80001 ); // mumbai provider - + const p2pContractGoerli = new ethers.Contract( "0x5f3EFA9A90532914545CEf527C530658af87e196", p2pix.abi, @@ -29,7 +29,7 @@ const getNetworksLiquidity = async (): Promise => { p2pix.abi, mumbaiProvider ); - + const depositListGoerli = await getValidDeposits(p2pContractGoerli); const depositListMumbai = await getValidDeposits(p2pContractMumbai); @@ -56,7 +56,7 @@ const getValidDeposits = async ( const eventsDeposits = await p2pContract.queryFilter(filterDeposits); console.log(eventsDeposits); - if(!contract) p2pContract = getContract(); // get metamask provider contract + if (!contract) p2pContract = getContract(); // get metamask provider contract const depositList = await Promise.all( eventsDeposits.map(async (deposit) => { diff --git a/src/components/ListingComponent/ListingComponent.vue b/src/components/ListingComponent/ListingComponent.vue index 309d458..5ee7e85 100644 --- a/src/components/ListingComponent/ListingComponent.vue +++ b/src/components/ListingComponent/ListingComponent.vue @@ -56,9 +56,9 @@ const getEventName = (event: string | undefined): string => { }; const getAmountFormatted = (amount?: BigNumber): string => { - if(!amount) return "" + if (!amount) return ""; return formatEther(amount); -} +}; // watch props changes watch(props, async (): Promise => { @@ -104,7 +104,9 @@ showInitialItems(); > {{ - isValidDeposit(item) ? item.remaining : getAmountFormatted(item.args?.amount) + isValidDeposit(item) + ? item.remaining + : getAmountFormatted(item.args?.amount) }} BRZ diff --git a/src/components/ListingComponent/__tests__/ListingComponent.spec.ts b/src/components/ListingComponent/__tests__/ListingComponent.spec.ts index df6cfec..382a3fc 100644 --- a/src/components/ListingComponent/__tests__/ListingComponent.spec.ts +++ b/src/components/ListingComponent/__tests__/ListingComponent.spec.ts @@ -1,7 +1,7 @@ import { mount } from "@vue/test-utils"; import ListingComponent from "@/components/ListingComponent/ListingComponent.vue"; import { createPinia, setActivePinia } from "pinia"; -import { expect } from 'vitest' +import { expect } from "vitest"; import { MockValidDeposits } from "@/model/mock/ValidDepositMock"; import { MockEvents } from "@/model/mock/EventMock"; diff --git a/src/model/mock/EventMock.ts b/src/model/mock/EventMock.ts index c3c606c..55d5d25 100644 --- a/src/model/mock/EventMock.ts +++ b/src/model/mock/EventMock.ts @@ -2,100 +2,91 @@ import type { Event } from "ethers"; import { vi } from "vitest"; export const MockEvents: Event[] = [ - { - "blockNumber": 1, - "blockHash": "0x8", - "transactionIndex": 1, - "removed": false, - "address": "0x0", - "data": "0x0", - "topics": [ - "0x0", - "0x0" - ], - "transactionHash": "0x0", - "logIndex": 1, - "event": "DepositAdded", - "eventSignature": "DepositAdded(address,uint256,address,uint256)", - "args": [ - "0x0", - { - "type": "BigNumber", - "hex": "0x00" - }, - "0x0", - { - "type": "BigNumber", - "hex": "0x6c6b935b8bbd400000" - }, - ], - getBlock: vi.fn(), - removeListener: vi.fn(), - getTransaction: vi.fn(), - getTransactionReceipt: vi.fn(), - }, - { - "blockNumber": 2, - "blockHash": "0x8", - "transactionIndex": 2, - "removed": false, - "address": "0x0", - "data": "0x0", - "topics": [ - "0x0", - "0x0" - ], - "transactionHash": "0x0", - "logIndex": 2, - "event": "LockAdded", - "eventSignature": "LockAdded(address,uint256,address,uint256)", - "args": [ - "0x0", - { - "type": "BigNumber", - "hex": "0x00" - }, - "0x0", - { - "type": "BigNumber", - "hex": "0x6c6b935b8bbd400000" - }, - ], - getBlock: vi.fn(), - removeListener: vi.fn(), - getTransaction: vi.fn(), - getTransactionReceipt: vi.fn(), - }, - { - "blockNumber": 3, - "blockHash": "0x8", - "transactionIndex": 3, - "removed": false, - "address": "0x0", - "data": "0x0", - "topics": [ - "0x0", - "0x0" - ], - "transactionHash": "0x0", - "logIndex": 3, - "event": "LockReleased", - "eventSignature": "LockReleased(address,uint256,address,uint256)", - "args": [ - "0x0", - { - "type": "BigNumber", - "hex": "0x00" - }, - "0x0", - { - "type": "BigNumber", - "hex": "0x6c6b935b8bbd400000" - }, - ], - getBlock: vi.fn(), - removeListener: vi.fn(), - getTransaction: vi.fn(), - getTransactionReceipt: vi.fn(), - } - ]; \ No newline at end of file + { + blockNumber: 1, + blockHash: "0x8", + transactionIndex: 1, + removed: false, + address: "0x0", + data: "0x0", + topics: ["0x0", "0x0"], + transactionHash: "0x0", + logIndex: 1, + event: "DepositAdded", + eventSignature: "DepositAdded(address,uint256,address,uint256)", + args: [ + "0x0", + { + type: "BigNumber", + hex: "0x00", + }, + "0x0", + { + type: "BigNumber", + hex: "0x6c6b935b8bbd400000", + }, + ], + getBlock: vi.fn(), + removeListener: vi.fn(), + getTransaction: vi.fn(), + getTransactionReceipt: vi.fn(), + }, + { + blockNumber: 2, + blockHash: "0x8", + transactionIndex: 2, + removed: false, + address: "0x0", + data: "0x0", + topics: ["0x0", "0x0"], + transactionHash: "0x0", + logIndex: 2, + event: "LockAdded", + eventSignature: "LockAdded(address,uint256,address,uint256)", + args: [ + "0x0", + { + type: "BigNumber", + hex: "0x00", + }, + "0x0", + { + type: "BigNumber", + hex: "0x6c6b935b8bbd400000", + }, + ], + getBlock: vi.fn(), + removeListener: vi.fn(), + getTransaction: vi.fn(), + getTransactionReceipt: vi.fn(), + }, + { + blockNumber: 3, + blockHash: "0x8", + transactionIndex: 3, + removed: false, + address: "0x0", + data: "0x0", + topics: ["0x0", "0x0"], + transactionHash: "0x0", + logIndex: 3, + event: "LockReleased", + eventSignature: "LockReleased(address,uint256,address,uint256)", + args: [ + "0x0", + { + type: "BigNumber", + hex: "0x00", + }, + "0x0", + { + type: "BigNumber", + hex: "0x6c6b935b8bbd400000", + }, + ], + getBlock: vi.fn(), + removeListener: vi.fn(), + getTransaction: vi.fn(), + getTransactionReceipt: vi.fn(), + }, +]; diff --git a/src/model/mock/ValidDepositMock.ts b/src/model/mock/ValidDepositMock.ts index 83a6412..c35c059 100644 --- a/src/model/mock/ValidDepositMock.ts +++ b/src/model/mock/ValidDepositMock.ts @@ -2,39 +2,39 @@ import { parseEther } from "ethers/lib/utils"; import type { ValidDeposit } from "../ValidDeposit"; export const MockValidDeposits: ValidDeposit[] = [ - { - "blockNumber": 1, - "depositID": parseEther("1"), - "remaining": 70, - "seller": "mockedSellerAddress", - "pixKey": "123456789" - }, - { - "blockNumber": 2, - "depositID": parseEther("2"), - "remaining": 200, - "seller": "mockedSellerAddress", - "pixKey": "123456789" - }, - { - "blockNumber": 3, - "depositID": parseEther("3"), - "remaining": 1250, - "seller": "mockedSellerAddress", - "pixKey": "123456789" - }, - { - "blockNumber": 4, - "depositID": parseEther("4"), - "remaining": 4000, - "seller": "mockedSellerAddress", - "pixKey": "123456789" - }, - { - "blockNumber": 5, - "depositID": parseEther("5"), - "remaining": 2000, - "seller": "mockedSellerAddress", - "pixKey": "123456789" - } - ] \ No newline at end of file + { + blockNumber: 1, + depositID: parseEther("1"), + remaining: 70, + seller: "mockedSellerAddress", + pixKey: "123456789", + }, + { + blockNumber: 2, + depositID: parseEther("2"), + remaining: 200, + seller: "mockedSellerAddress", + pixKey: "123456789", + }, + { + blockNumber: 3, + depositID: parseEther("3"), + remaining: 1250, + seller: "mockedSellerAddress", + pixKey: "123456789", + }, + { + blockNumber: 4, + depositID: parseEther("4"), + remaining: 4000, + seller: "mockedSellerAddress", + pixKey: "123456789", + }, + { + blockNumber: 5, + depositID: parseEther("5"), + remaining: 2000, + seller: "mockedSellerAddress", + pixKey: "123456789", + }, +]; diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts index 05daeed..0f93bb6 100644 --- a/src/shims-vue.d.ts +++ b/src/shims-vue.d.ts @@ -1,5 +1,5 @@ -declare module '*.vue' { - import { DefineComponent } from 'vue'; +declare module "*.vue" { + import { DefineComponent } from "vue"; const component: DefineComponent; export default component; -} \ No newline at end of file +} diff --git a/vite.config.ts b/vite.config.ts index df3943e..b618783 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -8,7 +8,7 @@ import vueJsx from "@vitejs/plugin-vue-jsx"; export default defineConfig({ test: { globals: true, - environment: 'jsdom' + environment: "jsdom", }, plugins: [vue(), vueJsx()], resolve: {