Replaced getTransportServers() with direct servers access, switched to readonly for all Config properties

Author: holgerd77

lib/config.ts

@@ -62,6 +62,9 @@ export interface Options {
 }
 
 export class Config {
+  // Initialize Common with an explicit 'chainstart' HF set until
+  // hardfork awareness is implemented within the library
+  // Also a fix for https://github.com/ethereumjs/ethereumjs-vm/issues/757
   public static readonly COMMON_DEFAULT = new Common({ chain: 'mainnet', hardfork: 'chainstart' })
   public static readonly LOGGER_DEFAULT = defaultLogger
   public static readonly SYNCMODE_DEFAULT = 'fast'
@@ -71,22 +74,18 @@ export class Config {
   public static readonly MINPEERS_DEFAULT = 2
   public static readonly MAXPEERS_DEFAULT = 25
 
-  public common: Common
-  public logger: Logger
-  public syncmode: string
-  public lightserv: boolean
-  public datadir: string
-  public transports: string[]
-  public minPeers: number
-  public maxPeers: number
+  public readonly common: Common
+  public readonly logger: Logger
+  public readonly syncmode: string
+  public readonly lightserv: boolean
+  public readonly datadir: string
+  public readonly transports: string[]
+  public readonly minPeers: number
+  public readonly maxPeers: number
 
-  private servers: (RlpxServer | Libp2pServer)[] = []
+  public readonly servers: (RlpxServer | Libp2pServer)[] = []
 
   constructor(options: Options = {}) {
-    // Initialize Common with an explicit 'chainstart' HF set until
-    // hardfork awareness is implemented within the library
-    // 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 ?? Config.COMMON_DEFAULT
     this.logger = options.logger ?? Config.LOGGER_DEFAULT
@@ -97,7 +96,20 @@ export class Config {
     this.minPeers = options.minPeers ?? Config.MINPEERS_DEFAULT
     this.maxPeers = options.maxPeers ?? Config.MAXPEERS_DEFAULT
 
-    this.servers = options.servers ? options.servers : this.getTransportServers()
+    if (options.servers) {
+      // Servers option takes precedence
+      this.servers = options.servers
+    } else {
+      // Otherwise parse transports from transports option
+      this.servers = parseTransports(this.transports).map((t) => {
+        if (t.name === 'rlpx') {
+          t.options.bootnodes = t.options.bootnodes || this.common.bootstrapNodes()
+          return new RlpxServer({ config: this, ...t.options })
+        } else {
+          return new Libp2pServer({ config: this, ...t.options })
+        }
+      })
+    }
   }
 
   /**
@@ -112,21 +124,4 @@ export class Config {
     const dataDir = `${this.datadir}/${networkDirName}ethereumjs/${syncDirName}`
     return dataDir
   }
-
-  /**
-   * Returns the transport servers created from the `transports` option
-   */
-  getTransportServers(): (RlpxServer | Libp2pServer)[] {
-    if (this.servers.length === 0) {
-      this.servers = parseTransports(this.transports).map((t) => {
-        if (t.name === 'rlpx') {
-          t.options.bootnodes = t.options.bootnodes || this.common.bootstrapNodes()
-          return new RlpxServer({ config: this, ...t.options })
-        } else {
-          return new Libp2pServer({ config: this, ...t.options })
-        }
-      })
-    }
-    return this.servers
-  }
 }

lib/net/peerpool.ts

@@ -55,7 +55,7 @@ export class PeerPool extends EventEmitter {
     if (this.opened) {
       return false
     }
-    this.config.getTransportServers().map((s) => {
+    this.config.servers.map((s) => {
       s.on('connected', (peer: Peer) => {
         this.connected(peer)
       })
@@ -196,7 +196,7 @@ export class PeerPool extends EventEmitter {
     if (this.size === 0) {
       this.noPeerPeriods += 1
       if (this.noPeerPeriods >= 3) {
-        const promises = this.config.getTransportServers().map(async (server: any) => {
+        const promises = this.config.servers.map(async (server: any) => {
           if (server.bootstrap) {
             this.config.logger.info('Retriggering bootstrap.')
             await server.bootstrap()

lib/service/service.ts

@@ -69,7 +69,7 @@ export class Service extends events.EventEmitter {
       return false
     }
     const protocols = this.protocols
-    this.config.getTransportServers().map((s) => s.addProtocols(protocols))
+    this.config.servers.map((s) => s.addProtocols(protocols))
     if (this.pool) {
       this.pool.on('banned', (peer: Peer) => this.config.logger.debug(`Peer banned: ${peer}`))
       this.pool.on('error', (error: Error) => this.emit('error', error))
@@ -100,7 +100,7 @@ export class Service extends events.EventEmitter {
     if (this.running) {
       return false
     }
-    await Promise.all(this.config.getTransportServers().map((s) => s.start()))
+    await Promise.all(this.config.servers.map((s) => s.start()))
     this.running = true
     this.config.logger.info(`Started ${this.name} service.`)
   }