🐛 Fix invalid nullish check

LiskArchive · Apr 23, 2020 · bf63ae4 · bf63ae4
1 parent 6b3c31a
commit bf63ae4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/elements/lisk-p2p/src/peer/base.ts b/elements/lisk-p2p/src/peer/base.ts
@@ -68,7 +68,7 @@ import {
 } from '../utils';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-export const socketErrorStatusCodes = {
+export const socketErrorStatusCodes: { [key: number]: string | undefined } = {
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-explicit-any
 	...(socketClusterClient.SCClientSocket as any).errorStatuses,
 	1000: 'Intentionally disconnected',

diff --git a/elements/lisk-p2p/src/peer/inbound.ts b/elements/lisk-p2p/src/peer/inbound.ts
@@ -60,10 +60,10 @@ export class InboundPeer extends Peer {
 			this.emit(EVENT_INBOUND_SOCKET_ERROR, error);
 		};
 		this._handleInboundSocketClose = (code, reasonMessage) => {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			const reason =
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				reasonMessage ?? socketErrorStatusCodes[code] ?? 'Unknown reason';
+				reasonMessage !== undefined && reasonMessage !== ''
+					? reasonMessage
+					: socketErrorStatusCodes[code] ?? 'Unknown reason';
 			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 			if (this._pingTimeoutId) {
 				clearTimeout(this._pingTimeoutId);

diff --git a/elements/lisk-p2p/src/peer/outbound.ts b/elements/lisk-p2p/src/peer/outbound.ts
@@ -172,10 +172,10 @@ export class OutboundPeer extends Peer {
 		outboundSocket.on(
 			'close',
 			(code: number, reasonMessage: string | undefined) => {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				const reason =
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-					reasonMessage ?? socketErrorStatusCodes[code] ?? 'Unknown reason';
+				const reason: string =
+					reasonMessage !== undefined && reasonMessage !== ''
+						? reasonMessage
+						: socketErrorStatusCodes[code] ?? 'Unknown reason';
 				this.emit(EVENT_CLOSE_OUTBOUND, {
 					peerInfo: this._peerInfo,
 					code,