From f7eb39bb1392b2762adac3a189da071249f4eca3 Mon Sep 17 00:00:00 2001 From: katherine Date: Sun, 17 Oct 2021 10:12:09 -0400 Subject: [PATCH] fix(lint): fix issue #1359 Signed-off-by: katherine --- .../test/typescript/unit/api-surface.test.ts | 12 +++---- .../src/main/typescript/model-type-guards.ts | 16 +++++----- .../plugin-ledger-connector-besu.ts | 10 +++--- .../src/main/typescript/model-type-guards.ts | 32 ++++++++++--------- 4 files changed, 36 insertions(+), 34 deletions(-) diff --git a/packages/cactus-plugin-keychain-vault/src/test/typescript/unit/api-surface.test.ts b/packages/cactus-plugin-keychain-vault/src/test/typescript/unit/api-surface.test.ts index bd90ac9cfd..ef7e95c4d9 100644 --- a/packages/cactus-plugin-keychain-vault/src/test/typescript/unit/api-surface.test.ts +++ b/packages/cactus-plugin-keychain-vault/src/test/typescript/unit/api-surface.test.ts @@ -1,9 +1,7 @@ -const tap = require("tap"); -import * as publicApi from "../../../main/typescript/public-api"; +import test, { Test } from "tape-promise/tape"; +import * as apiSurface from "../../../main/typescript/public-api"; -tap.pass("Test file can be executed"); - -tap.test("Library can be loaded", (assert: any) => { - assert.plan(1); - assert.ok(publicApi); +test("Library can be loaded", (t: Test) => { + t.ok(apiSurface, "apiSurface truthy OK"); + t.end(); }); diff --git a/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/model-type-guards.ts b/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/model-type-guards.ts index 30b81b2354..53c0ed829b 100644 --- a/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/model-type-guards.ts +++ b/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/model-type-guards.ts @@ -4,14 +4,14 @@ import { Web3SigningCredentialType, } from "./generated/openapi/typescript-axios/api"; -export function isWeb3SigningCredentialPrivateKeyHex( - x: any, -): x is Web3SigningCredentialPrivateKeyHex { - return x?.type && x?.type === Web3SigningCredentialType.PrivateKeyHex; +export function isWeb3SigningCredentialPrivateKeyHex(x?: { + type?: Web3SigningCredentialType; +}): x is Web3SigningCredentialPrivateKeyHex { + return x?.type === Web3SigningCredentialType.PrivateKeyHex; } -export function isWeb3SigningCredentialNone( - x: any, -): x is Web3SigningCredentialNone { - return x?.type && x?.type === Web3SigningCredentialType.None; +export function isWeb3SigningCredentialNone(x?: { + type?: Web3SigningCredentialType; +}): x is Web3SigningCredentialNone { + return x?.type === Web3SigningCredentialType.None; } diff --git a/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/plugin-ledger-connector-besu.ts b/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/plugin-ledger-connector-besu.ts index e85b0d1805..15e73b4604 100644 --- a/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/plugin-ledger-connector-besu.ts +++ b/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/plugin-ledger-connector-besu.ts @@ -92,6 +92,7 @@ import { GetPastLogsEndpoint } from "./web-services/get-past-logs-endpoint"; import { RunTransactionEndpoint } from "./web-services/run-transaction-endpoint"; import { GetBlockEndpoint } from "./web-services/get-block-v1-endpoint-"; import { GetBesuRecordEndpointV1 } from "./web-services/get-besu-record-endpoint-v1"; +import { AbiItem } from "web3-utils"; export const E_KEYCHAIN_NOT_FOUND = "cactus.connector.besu.keychain_not_found"; @@ -416,7 +417,8 @@ export class PluginLedgerConnectorBesu ); privKey = await keychainPlugin?.get(keychainEntryKey); } else { - privKey = (req.signingCredential as any).secret; + privKey = (req.signingCredential as Web3SigningCredentialPrivateKeyHex) + .secret; } const fnParams = { @@ -442,7 +444,7 @@ export class PluginLedgerConnectorBesu success = true; this.log.debug(`Web3 EEA Call output: `, callOutput); } else { - callOutput = await (method as any).call(); + callOutput = await method.call(); success = true; } return { success, callOutput }; @@ -542,7 +544,7 @@ export class PluginLedgerConnectorBesu public async getTxReceipt( request: RunTransactionRequest, - txPoolReceipt: any, + txPoolReceipt: TransactionReceipt, ): Promise { const fnTag = `${this.className}#getTxReceipt()`; @@ -915,7 +917,7 @@ export class PluginLedgerConnectorBesu ): Promise { const fnTag = `${this.className}#getBesuRecord()`; ////////////////////////////////////////////// - let abi: any = undefined; + let abi: AbiItem[] | AbiItem = []; const resp: GetBesuRecordV1Response = {}; const txHash = request.transactionHash; diff --git a/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/model-type-guards.ts b/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/model-type-guards.ts index 0a92a33563..312e8851a2 100644 --- a/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/model-type-guards.ts +++ b/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/model-type-guards.ts @@ -6,27 +6,29 @@ import { Web3SigningCredentialType, } from "./generated/openapi/typescript-axios/api"; -export function isWeb3SigningCredentialPrivateKeyHex( - x: any, -): x is Web3SigningCredentialPrivateKeyHex { - return x?.type && x?.type === Web3SigningCredentialType.PrivateKeyHex; +export function isWeb3SigningCredentialPrivateKeyHex(x?: { + type?: Web3SigningCredentialType; +}): x is Web3SigningCredentialPrivateKeyHex { + return x?.type === Web3SigningCredentialType.PrivateKeyHex; } -export function isWeb3SigningCredentialNone( - x: any, -): x is Web3SigningCredentialNone { - return x?.type && x?.type === Web3SigningCredentialType.None; +export function isWeb3SigningCredentialNone(x?: { + type?: Web3SigningCredentialType; +}): x is Web3SigningCredentialNone { + return x?.type === Web3SigningCredentialType.None; } -export function isWeb3SigningCredentialGethKeychainPassword( - x: any, -): x is Web3SigningCredentialGethKeychainPassword { - return x?.type && x?.type === Web3SigningCredentialType.GethKeychainPassword; +export function isWeb3SigningCredentialGethKeychainPassword(x?: { + type?: Web3SigningCredentialType; +}): x is Web3SigningCredentialGethKeychainPassword { + return x?.type === Web3SigningCredentialType.GethKeychainPassword; } -export function isWeb3SigningCredentialCactusKeychainRef( - x: any, -): x is Web3SigningCredentialCactusKeychainRef { +export function isWeb3SigningCredentialCactusKeychainRef(x?: { + type?: Web3SigningCredentialType; + keychainEntryKey?: string | unknown; + keychainId?: string | unknown; +}): x is Web3SigningCredentialCactusKeychainRef { return ( !!x?.type && x?.type === Web3SigningCredentialType.CactusKeychainRef &&