chore: fix require-await eslint rule issues (#1353)

Some fixes related to [require-await](https://typescript-eslint.io/rules/require-await/) eslint rule. The rule is not yet in our eslint rule set, but we may add it in PR #1171.

Author: teogeb

packages/broker/src/config/ConfigWizard.ts

@@ -255,7 +255,7 @@ const selectStoragePath = async (): Promise<StorageAnswers> => {
 }
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export const createStorageFile = async (config: any, answers: StorageAnswers): Promise<string> => {
+export const createStorageFile = (config: any, answers: StorageAnswers): string => {
     const dirPath = path.dirname(answers.storagePath)
     const dirExists = existsSync(dirPath)
     if (!dirExists) {
@@ -300,7 +300,7 @@ export const start = async (
         const pluginsAnswers = await getPluginAnswers()
         const config = getConfig(privateKey, pluginsAnswers)
         const storageAnswers = await getStorageAnswers()
-        const storagePath = await createStorageFile(config, storageAnswers)
+        const storagePath = createStorageFile(config, storageAnswers)
         logger.info('Welcome to the Streamr Network')
         const { mnemonic, networkExplorerUrl } = getNodeIdentity(privateKey)
         logger.info(`Your node's generated name is ${mnemonic}.`)

packages/broker/src/plugins/storage/StorageConfig.ts

@@ -66,15 +66,13 @@ export class StorageConfig {
     }
 
     async start(): Promise<void> {
-        await Promise.all([
-            this.storagePoller.start(this.abortController.signal),
-            this.storageEventListener.start()
-        ])
+        this.storageEventListener.start()
+        await this.storagePoller.start(this.abortController.signal)
     }
 
-    async destroy(): Promise<void> {
+    destroy(): void {
         this.abortController.abort()
-        await this.storageEventListener.destroy()
+        this.storageEventListener.destroy()
     }
 
     hasStreamPart(streamPart: StreamPartID): boolean {

packages/broker/src/plugins/storage/StorageEventListener.ts

@@ -39,12 +39,12 @@ export class StorageEventListener {
         }
     }
 
-    async start(): Promise<void> {
+    start(): void {
         this.streamrClient.on('addToStorageNode', this.onAddToStorageNode)
         this.streamrClient.on('removeFromStorageNode', this.onRemoveFromStorageNode)
     }
 
-    async destroy(): Promise<void> {
+    destroy(): void {
         this.streamrClient.off('addToStorageNode', this.onAddToStorageNode)
         this.streamrClient.off('removeFromStorageNode', this.onRemoveFromStorageNode)
     }

packages/broker/src/plugins/storage/StoragePlugin.ts

@@ -64,10 +64,8 @@ export class StoragePlugin extends Plugin<StoragePluginConfig> {
         this.storageConfig!.getStreamParts().forEach((streamPart) => {
             node.unsubscribe(streamPart)
         })
-        await Promise.all([
-            this.cassandra!.close(),
-            this.storageConfig!.destroy()
-        ])
+        await this.cassandra!.close()
+        this.storageConfig!.destroy()
     }
 
     // eslint-disable-next-line class-methods-use-this

packages/broker/test/unit/ConfigWizard.test.ts

@@ -118,9 +118,9 @@ describe('ConfigWizard', () => {
         it('should throw when no permissions on path', async () => {
             const dirPath = '/home/'
             const configPath = dirPath + 'test-config.json'
-            await expect(createStorageFile(CONFIG, {
+            expect(() => createStorageFile(CONFIG, {
                 storagePath: configPath
-            })).rejects.toThrow()
+            })).toThrow()
         })
 
     })

packages/broker/test/unit/plugins/storage/StorageConfig.test.ts

@@ -61,8 +61,8 @@ describe(StorageConfig, () => {
         getStoredStreams.mockRejectedValue(new Error('results not available'))
     })
 
-    afterEach(async () => {
-        await storageConfig?.destroy()
+    afterEach(() => {
+        storageConfig?.destroy()
     })
 
     it('state starts empty', () => {
@@ -163,7 +163,7 @@ describe(StorageConfig, () => {
     it('updates do not occur after destroy has been invoked', async () => {
         await storageConfig.start()
         await wait(POLL_TIME)
-        await storageConfig.destroy()
+        storageConfig.destroy()
 
         getStoredStreams.mockClear()
         getStoredStreams.mockResolvedValue({

packages/client/src/StreamMessageValidator.ts

@@ -65,7 +65,7 @@ export default class StreamMessageValidator {
             throw new ValidationError('Falsey argument passed to validate()!')
         }
 
-        await this.assertSignatureIsValid(streamMessage)
+        this.assertSignatureIsValid(streamMessage)
 
         switch (streamMessage.messageType) {
             case StreamMessageType.MESSAGE:
@@ -88,7 +88,7 @@ export default class StreamMessageValidator {
      * @param streamMessage the StreamMessage to validate.
      * @param verifyFn function(address, payload, signature): return true if the address and payload match the signature
      */
-    private async assertSignatureIsValid(streamMessage: StreamMessage): Promise<void> {
+    private assertSignatureIsValid(streamMessage: StreamMessage): void {
         const payload = createSignaturePayload({
             messageId: streamMessage.getMessageID(),
             serializedContent: streamMessage.getSerializedContent(),

packages/client/src/subscribe/ResendSubscription.ts

@@ -33,9 +33,7 @@ export class ResendSubscription extends Subscription {
         )
         this.pipe(this.resendThenRealtime.bind(this))
         this.pipe(this.orderMessages.transform())
-        this.onBeforeFinally.listen(async () => {
-            this.orderMessages.stop()
-        })
+        this.onBeforeFinally.listen(() => this.orderMessages.stop())
     }
 
     private async getResent(): Promise<MessageStream> {

packages/client/src/subscribe/subscribePipeline.ts

@@ -45,7 +45,7 @@ export const createSubscribePipeline = (opts: SubscriptionPipelineOptions): Mess
 
     /* eslint-enable object-curly-newline */
 
-    const onError = async (error: Error | StreamMessageError, streamMessage?: StreamMessage) => {
+    const onError = (error: Error | StreamMessageError, streamMessage?: StreamMessage) => {
         if (streamMessage) {
             ignoreMessages.add(streamMessage)
         }
@@ -95,11 +95,11 @@ export const createSubscribePipeline = (opts: SubscriptionPipelineOptions): Mess
             yield* msgChainUtil
         })
         // parse content
-        .forEach(async (streamMessage: StreamMessage) => {
+        .forEach((streamMessage: StreamMessage) => {
             streamMessage.getParsedContent()
         })
         // ignore any failed messages
-        .filter(async (streamMessage: StreamMessage) => {
+        .filter((streamMessage: StreamMessage) => {
             return !ignoreMessages.has(streamMessage)
         })
         .onBeforeFinally.listen(async () => {