From d250f2567d252c49a7b03b273569f676e087d0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= Date: Tue, 3 Oct 2023 10:58:43 +0200 Subject: [PATCH] some linting --- .../key-ceremony/key-ceremony.component.js | 6 +- .../js-client/src/tally/tally.component.js | 4 +- .../src/trustee/trustee.component.js | 6 +- bulletin_board/js-client/src/types.d.ts | 181 ++++++++---------- .../js-adapter/src/trustee_wrapper_adapter.js | 4 +- .../js-adapter/src/voter_wrapper_adapter.js | 4 +- 6 files changed, 97 insertions(+), 108 deletions(-) diff --git a/bulletin_board/js-client/src/key-ceremony/key-ceremony.component.js b/bulletin_board/js-client/src/key-ceremony/key-ceremony.component.js index 6ba56cf6..d58e0ac5 100644 --- a/bulletin_board/js-client/src/key-ceremony/key-ceremony.component.js +++ b/bulletin_board/js-client/src/key-ceremony/key-ceremony.component.js @@ -18,7 +18,7 @@ export class KeyCeremonyComponent extends TrusteeComponent { setupElection({ bulletinBoardClientParams, electionUniqueId, - authorizationExpirationTimestamp + authorizationExpirationTimestamp, }) { return this.setupElectionWithTypesFilter({ electionUniqueId, @@ -28,7 +28,7 @@ export class KeyCeremonyComponent extends TrusteeComponent { "create_election", "start_key_ceremony", "key_ceremony", - "end_key_ceremony" + "end_key_ceremony", ], }); } @@ -64,7 +64,7 @@ export class KeyCeremonyComponent extends TrusteeComponent { onTrusteeNeedsToBeRestored, onBackupNeeded, onBindBackupButton, - onBackupStarted + onBackupStarted, }) { const onSetupDone = await this.trustee.setup(); diff --git a/bulletin_board/js-client/src/tally/tally.component.js b/bulletin_board/js-client/src/tally/tally.component.js index e8902104..0062532b 100644 --- a/bulletin_board/js-client/src/tally/tally.component.js +++ b/bulletin_board/js-client/src/tally/tally.component.js @@ -31,7 +31,7 @@ export class TallyComponent extends TrusteeComponent { "end_key_ceremony", "start_tally", "tally", - "end_tally" + "end_tally", ], }); } @@ -60,7 +60,7 @@ export class TallyComponent extends TrusteeComponent { onRestore, onComplete, onStart, - onTrusteeNeedsToBeRestored + onTrusteeNeedsToBeRestored, }) { const onSetupDone = this.trustee.setup(); diff --git a/bulletin_board/js-client/src/trustee/trustee.component.js b/bulletin_board/js-client/src/trustee/trustee.component.js index 15e16b9f..203d5fd8 100644 --- a/bulletin_board/js-client/src/trustee/trustee.component.js +++ b/bulletin_board/js-client/src/trustee/trustee.component.js @@ -27,7 +27,7 @@ export class TrusteeComponent { uniqueId: trusteeUniqueId, authorityPublicKeyJSON, identificationKeys: trusteeIdentificationKeys, - wrapperAdapter: trusteeWrapperAdapter + wrapperAdapter: trusteeWrapperAdapter, }); } @@ -69,14 +69,14 @@ export class TrusteeComponent { ...bulletinBoardClientParams, headers: { Authorization: authorizationHeader, - TrusteeUniqueId: trusteeUniqueIdHeader + TrusteeUniqueId: trusteeUniqueIdHeader, }, }); const election = new Election({ uniqueId: electionUniqueId, bulletinBoardClient, - typesFilter + typesFilter, }); this.trustee.election = election; diff --git a/bulletin_board/js-client/src/types.d.ts b/bulletin_board/js-client/src/types.d.ts index 41c6c60b..c32bd117 100644 --- a/bulletin_board/js-client/src/types.d.ts +++ b/bulletin_board/js-client/src/types.d.ts @@ -1,7 +1,11 @@ export type Maybe = T | null; -export type Exact = { [K in keyof T]: T[K] }; -export type MakeOptional = Omit & { [SubKey in K]?: Maybe }; -export type MakeMaybe = Omit & { [SubKey in K]: Maybe }; +export type Exact = { + [K in keyof T]: T[K]; +}; +export type MakeOptional = Omit & + { [SubKey in K]?: Maybe }; +export type MakeMaybe = Omit & + { [SubKey in K]: Maybe }; /** All built-in and custom scalars, mapped to their actual values */ export type Scalars = { ID: string; @@ -14,71 +18,69 @@ export type Scalars = { }; export type Client = { - __typename?: 'Client'; - id: Scalars['ID']; - name: Scalars['String']; - publicKey?: Maybe; - publicKeyThumbprint?: Maybe; - type: Scalars['String']; + __typename?: "Client"; + id: Scalars["ID"]; + name: Scalars["String"]; + publicKey?: Maybe; + publicKeyThumbprint?: Maybe; + type: Scalars["String"]; }; /** Autogenerated return type of CreateElectionMutation */ export type CreateElectionMutationPayload = { - __typename?: 'CreateElectionMutationPayload'; + __typename?: "CreateElectionMutationPayload"; election?: Maybe; - error?: Maybe; + error?: Maybe; }; export type Election = { - __typename?: 'Election'; + __typename?: "Election"; authority: Client; - id: Scalars['ID']; + id: Scalars["ID"]; /** Returns the list of log entries for this election in the bulletin board */ logEntries: Array; - status: Scalars['String']; - title: Scalars['JSON']; + status: Scalars["String"]; + title: Scalars["JSON"]; /** Returns the list of trustees for this election */ trustees: Array; - verifiableResultsHash?: Maybe; - verifiableResultsUrl?: Maybe; + verifiableResultsHash?: Maybe; + verifiableResultsUrl?: Maybe; }; - export type ElectionLogEntriesArgs = { - after?: Maybe; - types?: Maybe>; + after?: Maybe; + types?: Maybe>; }; /** Autogenerated return type of EndVoteMutation */ export type EndVoteMutationPayload = { - __typename?: 'EndVoteMutationPayload'; - error?: Maybe; + __typename?: "EndVoteMutationPayload"; + error?: Maybe; pendingMessage?: Maybe; }; - export type LogEntry = MessageInterface & { - __typename?: 'LogEntry'; - chainedHash: Scalars['String']; + __typename?: "LogEntry"; + chainedHash: Scalars["String"]; client: Client; - contentHash?: Maybe; - decodedData?: Maybe; + contentHash?: Maybe; + decodedData?: Maybe; election: Election; - id: Scalars['ID']; - messageId: Scalars['String']; - signedData?: Maybe; + id: Scalars["ID"]; + messageId: Scalars["String"]; + signedData?: Maybe; }; export type MessageInterface = { client: Client; election: Election; - id: Scalars['ID']; - messageId: Scalars['String']; - signedData?: Maybe; + id: Scalars["ID"]; + messageId: Scalars["String"]; + signedData?: Maybe; }; export type Mutation = { - __typename?: 'Mutation'; + __typename?: "Mutation"; createElection?: Maybe; endVote?: Maybe; processKeyCeremonyStep?: Maybe; @@ -92,99 +94,89 @@ export type Mutation = { vote?: Maybe; }; - export type MutationCreateElectionArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; - export type MutationEndVoteArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; - export type MutationProcessKeyCeremonyStepArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; - export type MutationProcessTallyStepArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; - export type MutationPublishResultsArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; - export type MutationReportMissingTrusteeArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; - export type MutationStartKeyCeremonyArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; - export type MutationStartTallyArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; - export type MutationStartVoteArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; - export type MutationVoteArgs = { - messageId: Scalars['String']; - signedData: Scalars['String']; + messageId: Scalars["String"]; + signedData: Scalars["String"]; }; export type PendingMessage = MessageInterface & { - __typename?: 'PendingMessage'; + __typename?: "PendingMessage"; client: Client; election: Election; - id: Scalars['ID']; - messageId: Scalars['String']; - signedData?: Maybe; - status: Scalars['String']; + id: Scalars["ID"]; + messageId: Scalars["String"]; + signedData?: Maybe; + status: Scalars["String"]; }; /** Autogenerated return type of ProcessKeyCeremonyStepMutation */ export type ProcessKeyCeremonyStepMutationPayload = { - __typename?: 'ProcessKeyCeremonyStepMutationPayload'; - error?: Maybe; + __typename?: "ProcessKeyCeremonyStepMutationPayload"; + error?: Maybe; pendingMessage?: Maybe; }; /** Autogenerated return type of ProcessTallyStepMutation */ export type ProcessTallyStepMutationPayload = { - __typename?: 'ProcessTallyStepMutationPayload'; - error?: Maybe; + __typename?: "ProcessTallyStepMutationPayload"; + error?: Maybe; pendingMessage?: Maybe; }; /** Autogenerated return type of PublishResultsMutation */ export type PublishResultsMutationPayload = { - __typename?: 'PublishResultsMutationPayload'; - error?: Maybe; + __typename?: "PublishResultsMutationPayload"; + error?: Maybe; pendingMessage?: Maybe; }; export type Query = { - __typename?: 'Query'; + __typename?: "Query"; /** Returns a list of authorities in the bulletin board */ authorities: Array; /** Returns an election given its unique_id */ @@ -199,60 +191,57 @@ export type Query = { pendingMessage?: Maybe; }; - export type QueryElectionArgs = { - uniqueId: Scalars['String']; + uniqueId: Scalars["String"]; }; - export type QueryLogEntryArgs = { - electionUniqueId: Scalars['String']; - contentHash: Scalars['String']; + electionUniqueId: Scalars["String"]; + contentHash: Scalars["String"]; }; - export type QueryPendingMessageArgs = { - id?: Maybe; - messageId?: Maybe; + id?: Maybe; + messageId?: Maybe; }; /** Autogenerated return type of ReportMissingTrusteeMutation */ export type ReportMissingTrusteeMutationPayload = { - __typename?: 'ReportMissingTrusteeMutationPayload'; - error?: Maybe; + __typename?: "ReportMissingTrusteeMutationPayload"; + error?: Maybe; pendingMessage?: Maybe; }; /** Autogenerated return type of ResetTestDatabaseMutation */ export type ResetTestDatabaseMutationPayload = { - __typename?: 'ResetTestDatabaseMutationPayload'; - timestamp: Scalars['Int']; + __typename?: "ResetTestDatabaseMutationPayload"; + timestamp: Scalars["Int"]; }; /** Autogenerated return type of StartKeyCeremonyMutation */ export type StartKeyCeremonyMutationPayload = { - __typename?: 'StartKeyCeremonyMutationPayload'; - error?: Maybe; + __typename?: "StartKeyCeremonyMutationPayload"; + error?: Maybe; pendingMessage?: Maybe; }; /** Autogenerated return type of StartTallyMutation */ export type StartTallyMutationPayload = { - __typename?: 'StartTallyMutationPayload'; - error?: Maybe; + __typename?: "StartTallyMutationPayload"; + error?: Maybe; pendingMessage?: Maybe; }; /** Autogenerated return type of StartVoteMutation */ export type StartVoteMutationPayload = { - __typename?: 'StartVoteMutationPayload'; - error?: Maybe; + __typename?: "StartVoteMutationPayload"; + error?: Maybe; pendingMessage?: Maybe; }; /** Autogenerated return type of VoteMutation */ export type VoteMutationPayload = { - __typename?: 'VoteMutationPayload'; - error?: Maybe; + __typename?: "VoteMutationPayload"; + error?: Maybe; pendingMessage?: Maybe; }; diff --git a/voting_schemes/electionguard/js-adapter/src/trustee_wrapper_adapter.js b/voting_schemes/electionguard/js-adapter/src/trustee_wrapper_adapter.js index 04d74060..b3e2a804 100644 --- a/voting_schemes/electionguard/js-adapter/src/trustee_wrapper_adapter.js +++ b/voting_schemes/electionguard/js-adapter/src/trustee_wrapper_adapter.js @@ -65,9 +65,9 @@ export class TrusteeWrapperAdapter extends WrapperAdapter { if (result && result.length > 0) { // eslint-disable-next-line camelcase // Pyodide 0.17 return a Map instead of a object when python is a dict - const { message_type, content } = result[0] instanceof Map ? Object.fromEntries(result[0]) : result[0]; + const { messageTypeResult, content } = result[0] instanceof Map ? Object.fromEntries(result[0]) : result[0]; return { - messageType: message_type, + messageType: messageTypeResult, content }; } diff --git a/voting_schemes/electionguard/js-adapter/src/voter_wrapper_adapter.js b/voting_schemes/electionguard/js-adapter/src/voter_wrapper_adapter.js index dd9f32f0..f15cf0f4 100644 --- a/voting_schemes/electionguard/js-adapter/src/voter_wrapper_adapter.js +++ b/voting_schemes/electionguard/js-adapter/src/voter_wrapper_adapter.js @@ -62,9 +62,9 @@ export class VoterWrapperAdapter extends WrapperAdapter { if (result && result.length > 0) { // eslint-disable-next-line camelcase // Pyodide 0.17 return a Map instead of a object when python is a dict - const { message_type, content } = result[0] instanceof Map ? Object.fromEntries(result[0]) : result[0]; + const { messageTypeResult, content } = result[0] instanceof Map ? Object.fromEntries(result[0]) : result[0]; return { - messageType: message_type, + messageType: messageTypeResult, content: content }; }