fix typescript-eslint/no-unnecessary-condition lint errors

ryanio · ryanio · commit a780c64033c3 · 2020-11-10T13:38:08.000-08:00
diff --git a/browser/index.ts b/browser/index.ts
@@ -45,10 +45,10 @@ import { getLogger } from './logging'
 export function createNode(args: any) {
   const logger = getLogger({ loglevel: args.loglevel })
   const options = {
-    common: new Common({ chain: args.network || 'mainnet' }),
+    common: new Common({ chain: args.network ?? 'mainnet' }),
     servers: [new exports.Libp2pServer({ multiaddrs: [], ...args })],
-    syncmode: args.syncmode || 'fast',
-    db: level(args.db || 'ethereumjs'),
+    syncmode: args.syncmode ?? 'fast',
+    db: level(args.db ?? 'ethereumjs'),
     logger: logger,
   }
   return new exports.Node(options)
diff --git a/browser/libp2pnode.ts b/browser/libp2pnode.ts
@@ -26,7 +26,7 @@ export class Libp2pNode extends libp2p {
           bootstrap: {
             interval: 2000,
             enabled: options.bootnodes !== undefined,
-            list: options.bootnodes || [],
+            list: options.bootnodes ?? [],
           },
         },
         EXPERIMENTAL: {
diff --git a/lib/blockchain/chain.ts b/lib/blockchain/chain.ts
@@ -105,7 +105,7 @@ export class Chain extends EventEmitter {
     this.config = options.config
 
     this.blockchain =
-      options.blockchain ||
+      options.blockchain ??
       new Blockchain({
         db: options.db,
         validateBlocks: false,
@@ -253,7 +253,7 @@ export class Chain extends EventEmitter {
    * @return {Promise<void>}
    */
   async putBlocks(blocks: Block[]): Promise<void> {
-    if (!blocks) {
+    if (blocks.length === 0) {
       return
     }
     await this.open()
@@ -288,7 +288,7 @@ export class Chain extends EventEmitter {
    * @return {Promise<void>}
    */
   async putHeaders(headers: BlockHeader[]): Promise<void> {
-    if (!headers) {
+    if (headers.length === 0) {
       return
     }
     await this.open()
diff --git a/lib/net/peer/libp2pnode.ts b/lib/net/peer/libp2pnode.ts
@@ -35,7 +35,7 @@ export class Libp2pNode extends LibP2p {
           bootstrap: {
             interval: 2000,
             enabled: options.bootnodes !== undefined,
-            list: options.bootnodes || [],
+            list: options.bootnodes ?? [],
           },
         },
         dht: {
diff --git a/lib/net/peer/peer.ts b/lib/net/peer/peer.ts
@@ -120,7 +120,7 @@ export class Peer extends events.EventEmitter {
       address: this.address,
       transport: this.transport,
       protocols: Array.from(this.bound.keys()),
-      inbound: this.inbound || null,
+      inbound: this.inbound,
     }
     return Object.entries(properties)
       .filter(([, value]) => value !== undefined && value !== null && value.toString() !== '')
diff --git a/lib/net/protocol/flowcontrol.ts b/lib/net/protocol/flowcontrol.ts
@@ -36,7 +36,7 @@ export class FlowControl {
    * @param  {number} bv latest buffer value
    */
   handleReply(peer: Peer, bv: number) {
-    const params = this.in.get(peer.id) || {}
+    const params = this.in.get(peer.id) ?? {}
     params.ble = bv
     params.last = Date.now()
     this.in.set(peer.id, params)
@@ -54,7 +54,7 @@ export class FlowControl {
     const mrcReq = (peer.les as BoundProtocol).status.mrc[messageName].req
     const mrr = (peer.les as BoundProtocol).status.mrr
     const bl = (peer.les as BoundProtocol).status.bl
-    const params = this.in.get(peer.id) || { ble: bl }
+    const params = this.in.get(peer.id) ?? { ble: bl }
     if (params.last) {
       // recharge BLE at rate of MRR when less than BL
       // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
@@ -77,7 +77,7 @@ export class FlowControl {
    */
   handleRequest(peer: Peer, messageName: string, count: number): number {
     const now = Date.now()
-    const params = this.out.get(peer.id) || {}
+    const params = this.out.get(peer.id) ?? {}
     if (params.bv && params.last) {
       // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
       params.bv = Math.min(params.bv + this.mrr * (now - params.last), this.bl)
diff --git a/lib/net/protocol/lesprotocol.ts b/lib/net/protocol/lesprotocol.ts
@@ -174,8 +174,8 @@ export class LesProtocol extends Protocol {
       headNum: new BN(status.headNum),
       genesisHash: status.genesisHash,
       serveHeaders: this.isServer,
-      serveChainSince: status.serveChainSince && new BN(status.serveChainSince),
-      serveStateSince: status.serveStateSince && new BN(status.serveStateSince),
+      serveChainSince: status.serveChainSince ? new BN(status.serveChainSince) : undefined,
+      serveStateSince: status.serveStateSince ? new BN(status.serveStateSince) : undefined,
       txRelay: !!status.txRelay,
       bl: status['flowControl/BL'] && new BN(status['flowControl/BL']).toNumber(),
       mrr: status['flowControl/MRR'] && new BN(status['flowControl/MRR']).toNumber(),
diff --git a/lib/rpc/modules/admin.ts b/lib/rpc/modules/admin.ts
@@ -35,17 +35,17 @@ export class Admin {
    * @param {*} [cb] A function with an error object as the first argument and the result as the second
    */
   async nodeInfo(params: any, cb: Function) {
-    const rlpxInfo = this._node.server('rlpx').getRlpxInfo()
+    const rlpxInfo = (this._node.server('rlpx') as any).getRlpxInfo()
     const { enode, id, ip, listenAddr, ports } = rlpxInfo
     const { discovery, listener } = ports
     const clientName = getClientVersion()
 
     // TODO version not present in reference..
     // const ethVersion = Math.max.apply(Math, this._ethProtocol.versions)
     const latestHeader = (this._chain as any)._headers.latest
-    const difficulty = latestHeader?.difficulty || 0 // should be number
+    const difficulty = latestHeader?.difficulty ?? 0 // should be number
     const genesis = bufferToHex(this._chain.genesis.hash)
-    const head = bufferToHex(latestHeader?.mixHash || null)
+    const head = bufferToHex(latestHeader?.mixHash ?? null)
     const network = this._chain.networkId
 
     const nodeInfo = {
diff --git a/lib/service/ethereumservice.ts b/lib/service/ethereumservice.ts
@@ -21,16 +21,6 @@ export class EthereumService extends Service {
   public synchronizer: any
 
   /**
-<<<<<<< HEAD
- * Create new ETH service
- * @param {Object}   options constructor parameters
- * @param {Config}   [options.config] Client configuration
- * @param {Chain}    [options.chain] blockchain
- * @param {LevelDB}  [options.db=null] blockchain database
- * @param {number}   [options.timeout] protocol timeout
- * @param {number}   [options.interval] sync retry interval
- */
-=======
    * Create new ETH service
    * @param {Object}   options constructor parameters
    * @param {Config}   [options.config] Client configuration
@@ -39,23 +29,17 @@ export class EthereumService extends Service {
    * @param {number}   [options.timeout] protocol timeout
    * @param {number}   [options.interval] sync retry interval
    */
->>>>>>> Config -> syncmode, minPeers, maxPeers: horizontal integration
   constructor(options?: any) {
     options = { ...defaultOptions, ...options }
     super(options)
 
     this.flow = new FlowControl(options)
-<<<<<<< HEAD
     this.chain = options.chain ?? new Chain(options)
-=======
-    this.chain = options.chain || new Chain(options)
->>>>>>> Config -> syncmode, minPeers, maxPeers: horizontal integration
     this.interval = options.interval
     this.timeout = options.timeout
     this.synchronizer = null
   }
 
-
   /**
    * Service name
    * @protected
diff --git a/lib/sync/fetcher/fetcher.ts b/lib/sync/fetcher/fetcher.ts
@@ -168,6 +168,7 @@ export class Fetcher extends Readable {
       return false
     }
     const peer = this.peer()
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (peer) {
       peer.idle = false
       this.in.remove()
diff --git a/lib/sync/sync.ts b/lib/sync/sync.ts
@@ -90,7 +90,7 @@ export class Synchronizer extends EventEmitter {
         // @ts-ignore: Property 'sync' does not exist on type 'Synchronizer'
         if (await this.sync()) this.emit('synchronized')
       } catch (error) {
-        if (this.running) this.emit('error', error)
+        this.emit('error', error)
       }
       await new Promise((resolve) => setTimeout(resolve, this.interval))
     }
diff --git a/lib/util/parse.ts b/lib/util/parse.ts
@@ -139,7 +139,7 @@ async function parseGethParams(json: any) {
   }
   params.hardforks = hardforks.map((name) => ({
     name: name,
-    block: name === 'chainstart' ? 0 : config[forkMap[name]] || null,
+    block: name === 'chainstart' ? 0 : config[forkMap[name]] ?? null,
   }))
   return params
 }
diff --git a/test/blockchain/chain.spec.ts b/test/blockchain/chain.spec.ts
@@ -12,23 +12,17 @@ import { Buffer } from 'buffer' //eslint-disable-line @typescript-eslint/no-unus
 import { Config } from '../../lib/config'
 
 tape('[Chain]', (t) => {
-  t.test('should test blockchain DB is initialized', (t) => {
+  t.test('should test blockchain DB is initialized', async (t) => {
     const chain = new Chain({ config: new Config() }) // eslint-disable-line no-new
 
     const db = chain.db
     const testKey = 'name'
     const testValue = 'test'
 
-    db.put(testKey, testValue, function (err: Error) {
-      if (err) t.fail('could not write key to db')
-
-      db.get(testKey, function (err: Error, value: any) {
-        if (err) t.fail('could not read key to db')
-
-        t.equal(testValue, value, 'read value matches written value')
-        t.end()
-      })
-    })
+    await db.put(testKey, testValue)
+    const value = await db.get(testKey)
+    t.equal(testValue, value, 'read value matches written value')
+    t.end()
   })
 
   t.test('should retrieve chain properties', async (t) => {
diff --git a/test/integration/fastsync.ts b/test/integration/fastsync.ts
@@ -18,7 +18,7 @@ tape('[Integration:FastSync]', async (t) => {
     const config = new Config({ servers: [server], minPeers: 1 })
     const service = new FastEthereumService({
       config,
-      interval: options.interval || 10,
+      interval: options.interval ?? 10,
       timeout: 500,
       chain,
     })
diff --git a/test/integration/mocks/mockserver.ts b/test/integration/mocks/mockserver.ts
@@ -10,7 +10,7 @@ export default class MockServer extends Server {
 
   constructor(options: any = {}) {
     super({ config: new Config({ transports: [] }), ...options })
-    this.location = options.location || '127.0.0.1'
+    this.location = options.location ?? '127.0.0.1'
     this.server = null
     this.peers = {}
   }
@@ -84,6 +84,6 @@ export default class MockServer extends Server {
   }
 
   async wait(delay: any) {
-    await new Promise((resolve) => setTimeout(resolve, delay || 100))
+    await new Promise((resolve) => setTimeout(resolve, delay ?? 100))
   }
 }
diff --git a/test/rpc/blockChainStub.ts b/test/rpc/blockChainStub.ts
@@ -1,9 +1,9 @@
 export function blockChain(options: any) {
   const block = {
     toJSON: () => ({
-      number: options.number || 444444,
-      hash: options.hash || '0x910abca1728c53e8d6df870dd7af5352e974357dc58205dea1676be17ba6becf',
-      transactions: options.transactions || [
+      number: options.number ?? 444444,
+      hash: options.hash ?? '0x910abca1728c53e8d6df870dd7af5352e974357dc58205dea1676be17ba6becf',
+      transactions: options.transactions ?? [
         { hash: '0x0be3065cf288b071ccff922c1c601e2e5628d488b66e781c260ecee36054a2dc' },
       ],
     }),
diff --git a/test/sync/fetcher/blockfetcher.ts b/test/sync/fetcher/blockfetcher.ts
@@ -7,7 +7,7 @@ import { Config } from '../../../lib/config'
 defaultLogger.silent = true
 
 async function wait(delay?: number) {
-  await new Promise((resolve) => setTimeout(resolve, delay || 10))
+  await new Promise((resolve) => setTimeout(resolve, delay ?? 10))
 }
 
 tape('[BlockFetcher]', (t) => {

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ export class Peer extends events.EventEmitter {`
`120`	`120`	`address: this.address,`
`121`	`121`	`transport: this.transport,`
`122`	`122`	`protocols: Array.from(this.bound.keys()),`
`123`		`- inbound: this.inbound \|\| null,`
	`123`	`+ inbound: this.inbound,`
`124`	`124`	`}`
`125`	`125`	`return Object.entries(properties)`
`126`	`126`	`.filter(([, value]) => value !== undefined && value !== null && value.toString() !== '')`
Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,7 @@ export class Fetcher extends Readable {`
`168`	`168`	`return false`
`169`	`169`	`}`
`170`	`170`	`const peer = this.peer()`
	`171`	`+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition`
`171`	`172`	`if (peer) {`
`172`	`173`	`peer.idle = false`
`173`	`174`	`this.in.remove()`