From a3e55f735295615f74e856218e39b971f7685091 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 11 Oct 2018 14:16:59 +0200 Subject: [PATCH] adapt code rules from codacy --- src/keeper/ContractWrapperBase.ts | 1 - src/keeper/Keeper.ts | 7 ++----- src/keeper/Market.ts | 1 - src/ocean/Asset.ts | 1 - src/ocean/Order.ts | 2 +- src/ocean/Tribe.ts | 3 --- test/keeper/Keeper.test.ts | 1 - test/ocean/Ocean.test.ts | 1 - test/ocean/Order.test.ts | 1 - tsconfig.json | 1 + 10 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/keeper/ContractWrapperBase.ts b/src/keeper/ContractWrapperBase.ts index 3a559bc..2676090 100644 --- a/src/keeper/ContractWrapperBase.ts +++ b/src/keeper/ContractWrapperBase.ts @@ -1,7 +1,6 @@ import Event from "web3" import Contract from "web3-eth-contract" import Config from "../models/Config" -import Logger from "../utils/Logger" import ContractHandler from "./ContractHandler" import Web3Helper from "./Web3Helper" diff --git a/src/keeper/Keeper.ts b/src/keeper/Keeper.ts index 3f8281a..53193d2 100644 --- a/src/keeper/Keeper.ts +++ b/src/keeper/Keeper.ts @@ -8,7 +8,7 @@ export default class Keeper { public static async getInstance(config: Config, helper: Web3Helper) { - const contracts = new Keeper(config, helper) + const contracts = new Keeper(helper) contracts.market = await OceanMarket.getInstance(config, helper) contracts.auth = await OceanAuth.getInstance(config, helper) @@ -22,10 +22,7 @@ export default class Keeper { public market: OceanMarket public auth: OceanAuth - private config: Config - - private constructor(config: Config, helper: Web3Helper) { - this.config = config + private constructor(helper: Web3Helper) { this.web3Helper = helper } } diff --git a/src/keeper/Market.ts b/src/keeper/Market.ts index 81a0772..0cd56fe 100644 --- a/src/keeper/Market.ts +++ b/src/keeper/Market.ts @@ -3,7 +3,6 @@ import {Receipt} from "web3-utils" import Asset from "../models/Asset" import Config from "../models/Config" import Order from "../models/Order" -import Logger from "../utils/Logger" import ContractWrapperBase from "./ContractWrapperBase" import Web3Helper from "./Web3Helper" diff --git a/src/ocean/Asset.ts b/src/ocean/Asset.ts index 3159536..7826f78 100644 --- a/src/ocean/Asset.ts +++ b/src/ocean/Asset.ts @@ -1,4 +1,3 @@ -import Keeper from "../keeper/Keeper" import AssetModel from "../models/Asset" import Logger from "../utils/Logger" import OceanBase from "./OceanBase" diff --git a/src/ocean/Order.ts b/src/ocean/Order.ts index 90404f4..6bb190b 100644 --- a/src/ocean/Order.ts +++ b/src/ocean/Order.ts @@ -104,7 +104,7 @@ export default class Order extends OceanBase { return order if (false) { // todo: AccessRequestCommitted event is not emitted in this flow - const finalOrder: OrderModel = await auth.listenToEventOnce( + await auth.listenToEventOnce( "AccessRequestCommitted", { filter: { _id: order.id, diff --git a/src/ocean/Tribe.ts b/src/ocean/Tribe.ts index 552b918..6550ca4 100644 --- a/src/ocean/Tribe.ts +++ b/src/ocean/Tribe.ts @@ -7,11 +7,8 @@ export default class Tribe { return new Tribe(web3Helper) } - private web3Helper: Web3Helper - private constructor(web3Helper: Web3Helper) { - this.web3Helper = web3Helper } // did ddo for tribes/marketplaces diff --git a/test/keeper/Keeper.test.ts b/test/keeper/Keeper.test.ts index a5d5786..06f8209 100644 --- a/test/keeper/Keeper.test.ts +++ b/test/keeper/Keeper.test.ts @@ -3,7 +3,6 @@ import ContractHandler from "../../src/keeper/ContractHandler" import Keeper from "../../src/keeper/Keeper" import Web3Helper from "../../src/keeper/Web3Helper" import Config from "../../src/models/Config" -import Logger from "../../src/utils/Logger" let keeper: Keeper diff --git a/test/ocean/Ocean.test.ts b/test/ocean/Ocean.test.ts index 8a23649..fca5ba1 100644 --- a/test/ocean/Ocean.test.ts +++ b/test/ocean/Ocean.test.ts @@ -3,7 +3,6 @@ import ContractHandler from "../../src/keeper/ContractHandler" import Web3Helper from "../../src/keeper/Web3Helper" import Config from "../../src/models/Config" import Ocean from "../../src/ocean/Ocean" -import Logger from "../../src/utils/Logger" let ocean: Ocean diff --git a/test/ocean/Order.test.ts b/test/ocean/Order.test.ts index db5ed4b..783be44 100644 --- a/test/ocean/Order.test.ts +++ b/test/ocean/Order.test.ts @@ -8,7 +8,6 @@ import OrderModel from "../../src/models/Order" import Account from "../../src/ocean/Account" import Asset from "../../src/ocean/Asset" import Order from "../../src/ocean/Order" -import Logger from "../../src/utils/Logger"; let keeper: Keeper let testAsset: AssetModel diff --git a/tsconfig.json b/tsconfig.json index f257a1a..3b8dbdc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,6 +6,7 @@ "es7" ], "declaration": true, + "noUnusedLocals": true, "module": "commonjs", "noImplicitAny": false, "removeComments": true,