Skip to content

Commit

Permalink
chore(deps): update dependency @po.et/tslint-rules to v2 (#204)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency @po.et/tslint-rules to v2

* fix: linter errors and config
  • Loading branch information
renovate[bot] authored and warrenv committed Oct 29, 2018
1 parent f809f04 commit 7120039
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 62 deletions.
55 changes: 7 additions & 48 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -53,7 +53,7 @@
"parse-data-url": "1.0.0"
},
"devDependencies": {
"@po.et/tslint-rules": "1.4.6",
"@po.et/tslint-rules": "2.0.0",
"@types/node-fetch": "1.6.9",
"husky": "1.1.2",
"lint-staged": "7.3.0",
Expand Down
3 changes: 2 additions & 1 deletion src/Interfaces.test.ts
@@ -1,4 +1,5 @@
/* tslint:disable:no-relative-imports */
/* tslint:disable:max-line-length */
import { describe } from 'riteway'
import { MyIdentity, Ed25519TheRaven, Ed25519SignedRaven, RsaTheRaven, RsaSignedRaven } from '../tests/unit/shared'
import { ClaimType, isIdentity, isSignedVerifiableClaim, isVerifiableClaim, isWork } from './Interfaces'
Expand Down Expand Up @@ -97,7 +98,7 @@ describe('Interfaces.isVerifiableClaim', async (assert: any) => {
})
}

;['', false, null, undefined].forEach(value => {
['', false, null, undefined].forEach(value => {
{
assert({
given: 'a claim with an invalid date',
Expand Down
2 changes: 1 addition & 1 deletion src/VerifiableClaim.test.ts
Expand Up @@ -43,7 +43,7 @@ describe('VerifiableClaim.generateClaimId', async (assert: any) => {

{
const id = await generateClaimId({ ...BaseEd25519RavenClaim, issuanceDate: '2017-09-13T15:00:00.000Z' }).catch(
getErrorMessage
getErrorMessage,
)

assert({
Expand Down
3 changes: 2 additions & 1 deletion src/VerifiableClaimSigner.test.ts
@@ -1,4 +1,5 @@
/* tslint:disable:no-relative-imports */
/* tslint:disable:max-line-length */
import { describe } from 'riteway'

import {
Expand Down Expand Up @@ -480,7 +481,7 @@ describe('VerifiableClaimSigner.isValidSignedVerifiableClaim', async (assert: an
const signedWorkClaim = await signWorkClaim(Ed25519TheRaven)

const result = await Promise.all(
['', null, undefined].map(value => isValidSignedVerifiableClaim({ ...signedWorkClaim, issuanceDate: value }))
['', null, undefined].map(value => isValidSignedVerifiableClaim({ ...signedWorkClaim, issuanceDate: value })),
)

assert({
Expand Down
6 changes: 3 additions & 3 deletions src/VerifiableClaimSigner.ts
Expand Up @@ -11,7 +11,7 @@ import { SupportedAlgorithms } from './util/KeyHelper'

export interface VerifiableClaimSigner {
readonly configureSignVerifiableClaim: (
config: SignVerifiableClaimConfig
config: SignVerifiableClaimConfig,
) => (verifiableClaim: VerifiableClaim) => Promise<SignedVerifiableClaim>
readonly isValidSignedVerifiableClaim: (signedVerifiableClaim: SignedVerifiableClaim) => Promise<boolean>
readonly isValidSignature: (signedVerifiableClaim: SignedVerifiableClaim) => Promise<boolean>
Expand Down Expand Up @@ -43,7 +43,7 @@ export const getVerifiableClaimSigner = (): VerifiableClaimSigner => {
}

const createSigningOptions = (algorithm: SigningAlgorithm = SigningAlgorithm.Ed25519Signature2018) => (
privateKey: string
privateKey: string,
) => SupportedAlgorithms[algorithm].getSigningOptions(privateKey)

const configureSignVerifiableClaim = ({
Expand All @@ -64,7 +64,7 @@ export const getVerifiableClaimSigner = (): VerifiableClaimSigner => {
issuanceDate: verifiableClaim.issuanceDate,
claim: verifiableClaim.claim,
},
signingOptions
signingOptions,
)
if (isValidSignature(signedClaim)) return signedClaim
throw new IllegalArgumentException('Claim signature is invalid')
Expand Down
2 changes: 1 addition & 1 deletion src/util/DataDocumentLoader.ts
Expand Up @@ -17,7 +17,7 @@ export const dataDocumentLoader = async (url: string, callback: (error: any, dat
const extractedParsedData = parsedData.base64 ? fromBase64(parsedData.data) : parsedData.data
const publicKey = SupportedAlgorithms[getSigningAlgorithm(extractedParsedData.algorithm)].publicKey(
url,
extractedParsedData.publicKey
extractedParsedData.publicKey,
)
return callback(null, {
contextUrl: ['https://w3id.org/security/v2'],
Expand Down
8 changes: 4 additions & 4 deletions src/util/KeyHelper.ts
Expand Up @@ -54,7 +54,7 @@ type Algorithms = { [P in SigningAlgorithm]: Algorithm }

interface Algorithm {
readonly engine: {
readonly generateKeyPair: (options: GenerateKeyPairOptions) => KeyPair
readonly generateKeyPair: (options: GenerateKeyPairOptions) => KeyPair,
}
readonly getPublicKeyFromPrivateKey: (privateKey: any) => any
readonly getPublicKeyStringFromPrivateKeyString: (privateKey: string) => string
Expand Down Expand Up @@ -105,7 +105,7 @@ export const SupportedAlgorithms: Algorithms = {

export const createIssuerFromPrivateKey = (
privateKey: string,
algorithm: SigningAlgorithm = SigningAlgorithm.Ed25519Signature2018
algorithm: SigningAlgorithm = SigningAlgorithm.Ed25519Signature2018,
): string => {
const signingInfo = {
algorithm,
Expand All @@ -116,7 +116,7 @@ export const createIssuerFromPrivateKey = (
}

const generateKeyPair = (algorithm: SigningAlgorithm = SigningAlgorithm.Ed25519Signature2018) => (
options: GenerateKeyPairOptions = {}
options: GenerateKeyPairOptions = {},
): KeyPair => {
const keyPair = SupportedAlgorithms[algorithm].engine.generateKeyPair(options)
return {
Expand All @@ -130,7 +130,7 @@ const generateED25519KeyPair = generateKeyPair(SigningAlgorithm.Ed25519Signature
const generateRsaKeyPair = generateKeyPair(SigningAlgorithm.RsaSignature2018)

const getPublicKeyFromPrivateKey = (algorithm: SigningAlgorithm = SigningAlgorithm.Ed25519Signature2018) => (
privateKey: number[]
privateKey: number[],
): EncodeBuffer => {
return SupportedAlgorithms[algorithm].getPublicKeyFromPrivateKey({ privateKey })
}
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/shared.ts
@@ -1,4 +1,5 @@
/* tslint:disable:no-relative-imports */
/* tslint:disable:max-line-length */
import {
BaseVerifiableClaim,
ClaimContext,
Expand All @@ -21,7 +22,7 @@ export const getErrorMessage = (err: Error): string => err.message
export const makeClaim = (
claim: object,
type: ClaimType = ClaimType.Work,
context: ClaimContext = DefaultClaimContext
context: ClaimContext = DefaultClaimContext,
): BaseVerifiableClaim => {
const issuer = Ed25519TheRaven.issuer
const issuanceDate = '2017-12-11T22:54:40.261Z'
Expand Down
5 changes: 4 additions & 1 deletion tslint.json
@@ -1,5 +1,8 @@
{
"extends": [
"@po.et/tslint-rules"
]
],
"rules": {
"object-literal-key-quotes": [true, "as-needed"]
}
}

0 comments on commit 7120039

Please sign in to comment.