Clean up chain constructor & initialization

Author: cgewecke

lib/blockchain/chain.ts

@@ -25,7 +25,7 @@ export interface ChainOptions {
   /**
    * Specify a blockchain which implements the Chain interface
    */
-  blockchain?: Chain
+  blockchain?: Blockchain
 
   /**
    * Logging provider
@@ -80,14 +80,6 @@ export interface GenesisBlockParams {
   [key: string]: Buffer
 }
 
-/**
- * Default blockchain constructor options
- */
-const defaultOptions = {
-  logger: defaultLogger,
-  common: new Common({ chain: 'mainnet', hardfork: 'chainstart' }),
-}
-
 /**
  * Blockchain
  * @memberof module:blockchain
@@ -97,7 +89,7 @@ export class Chain extends EventEmitter {
   public common: Common
   public db: any
   public blockchain: Blockchain
-  public opened = false
+  public opened: boolean
 
   private _headers: ChainHeaders = {
     latest: null,
@@ -115,35 +107,21 @@ export class Chain extends EventEmitter {
    * Create new chain
    * @param {ChainOptions} options
    */
-  constructor(options?: ChainOptions) {
+  constructor(options: ChainOptions = {}) {
     super()
-    options = { ...defaultOptions, ...options }
-    this.logger = options.logger!
-    this.common = options.common!
-    this.db = options.db
-
-    //@ts-ignore Blockchain will be set in init
-    this.blockchain = options.blockchain
-    this.init()
-  }
+    this.logger = options.logger || defaultLogger
+    this.common = options.common || new Common({ chain: 'mainnet', hardfork: 'chainstart' })
 
-  /**
-   * Initializes blockchain
-   */
-  private init() {
-    if (!this.blockchain) {
-      this.blockchain = new Blockchain({
-        db: this.db,
+    this.blockchain =
+      options.blockchain ||
+      new Blockchain({
+        db: options.db,
         validateBlocks: false,
         validatePow: false,
         common: this.common,
       })
-      if (!this.db) {
-        this.db = this.blockchain.db
-      }
-    }
 
-    this.reset()
+    this.db = this.blockchain.db
     this.opened = false
   }
 

test/rpc/helpers.ts

@@ -6,6 +6,7 @@ import { RPCManager as Manager } from '../../lib/rpc'
 import * as Logger from '../../lib/logging'
 import { blockChain } from './blockChainStub'
 import { Chain } from '../../lib/blockchain/chain'
+import Blockchain from '@ethereumjs/blockchain'
 
 const config: any = { loglevel: 'error' }
 config.logger = Logger.getLogger(config)
@@ -26,7 +27,7 @@ export function createManager(node: any) {
 }
 
 export function createNode(nodeConfig?: any) {
-  const chain = new Chain({ blockchain: (<unknown>blockChain({})) as Chain })
+  const chain = new Chain({ blockchain: (<unknown>blockChain({})) as Blockchain })
   chain.opened = true
   const defaultNodeConfig = {
     blockchain: chain,