Use nulling coalescing operator for config options assignment, do config member assignment after options clone expression

Author: holgerd77

lib/config.ts

@@ -71,12 +71,12 @@ export class Config {
     // Also a fix for https://github.com/ethereumjs/ethereumjs-vm/issues/757
 
     // TODO: map chainParams (and lib/util.parseParams) to new Common format
-    this.common = options.common ? options.common : Config.COMMON_DEFAULT
-    this.logger = options.logger ? options.logger : Config.LOGGER_DEFAULT
-    this.servers = options.servers ? options.servers : Config.SERVERS_DEFAULT
-    this.syncmode = options.syncmode ? options.syncmode : Config.SYNCMODE_DEFAULT
-    this.lightserv = options.lightserv ? options.lightserv : Config.LIGHTSERV_DEFAULT
-    this.minPeers = options.minPeers ? options.minPeers : Config.MINPEERS_DEFAULT
-    this.maxPeers = options.maxPeers ? options.maxPeers : Config.MAXPEERS_DEFAULT
+    this.common = options.common ?? Config.COMMON_DEFAULT
+    this.logger = options.logger ?? Config.LOGGER_DEFAULT
+    this.servers = options.servers ?? Config.SERVERS_DEFAULT
+    this.syncmode = options.syncmode ?? Config.SYNCMODE_DEFAULT
+    this.lightserv = options.lightserv ?? Config.LIGHTSERV_DEFAULT
+    this.minPeers = options.minPeers ?? Config.MINPEERS_DEFAULT
+    this.maxPeers = options.maxPeers ?? Config.MAXPEERS_DEFAULT
   }
 }

lib/net/peer/peer.ts

@@ -41,9 +41,8 @@ export class Peer extends events.EventEmitter {
   constructor(options: any) {
     super()
 
-    this.config = options.config
-
     options = { ...defaultOptions, ...options }
+    this.config = options.config
 
     this.id = options.id
     this.address = options.address

lib/net/protocol/protocol.ts

@@ -49,9 +49,9 @@ export class Protocol extends EventEmitter {
   constructor(options?: any) {
     super()
 
+    options = { ...defaultOptions, ...options }
     this.config = options.config
 
-    options = { ...defaultOptions, ...options }
     this.timeout = options.timeout
     this.opened = false
   }

lib/net/server/server.ts

@@ -24,9 +24,8 @@ export class Server extends EventEmitter {
   constructor(options: any) {
     super()
 
-    this.config = options.config
-
     options = { ...defaultOptions, ...options }
+    this.config = options.config
 
     this.refreshInterval = options.refreshInterval
     this.protocols = new Set()

lib/sync/fetcher/fetcher.ts

@@ -48,9 +48,8 @@ export class Fetcher extends Readable {
   constructor(options: any) {
     super({ ...options, objectMode: true })
 
-    this.config = options.config
-
     options = { ...defaultOptions, ...options }
+    this.config = options.config
 
     this.pool = options.pool
     this.timeout = options.timeout

lib/sync/sync.ts

@@ -35,9 +35,8 @@ export class Synchronizer extends EventEmitter {
   constructor(options?: any) {
     super()
 
-    this.config = options.config
-
     options = { ...defaultOptions, ...options }
+    this.config = options.config
 
     this.pool = options.pool
     this.chain = options.chain