use os.homedir() for default cli datadir arg, keep ./datadir for test runs (Config.DATADIR_DEFAULT in config.ts when options.datadir is undefined)

Author: ryanio

packages/client/bin/cli.ts

@@ -7,6 +7,7 @@ import EthereumClient from '../lib/client'
 import { Config } from '../lib/config'
 import { Logger } from '../lib/logging'
 import { RPCManager } from '../lib/rpc'
+const os = require('os')
 const path = require('path')
 const fs = require('fs-extra')
 const chains = require('@ethereumjs/common/dist/chains').chains
@@ -38,7 +39,7 @@ const args = require('yargs')
     },
     datadir: {
       describe: 'Data directory for the blockchain',
-      default: Config.DATADIR_DEFAULT,
+      default: `${os.homedir()}/Library/Ethereum/ethereumjs`,
     },
     transports: {
       describe: 'Network transports',

packages/client/lib/config.ts

@@ -3,7 +3,6 @@ import VM from '@ethereumjs/vm'
 import { getLogger, Logger } from './logging'
 import { Libp2pServer, RlpxServer } from './net/server'
 import { parseMultiaddrs, parseTransports } from './util'
-const os = require('os')
 
 export interface ConfigOptions {
   /**
@@ -130,7 +129,7 @@ export class Config {
   public static readonly CHAIN_DEFAULT = 'mainnet'
   public static readonly SYNCMODE_DEFAULT = 'full'
   public static readonly LIGHTSERV_DEFAULT = false
-  public static readonly DATADIR_DEFAULT = `${os.homedir()}/Library/Ethereum/ethereumjs`
+  public static readonly DATADIR_DEFAULT = `./datadir`
   public static readonly TRANSPORTS_DEFAULT = ['rlpx:port=30303', 'libp2p']
   public static readonly RPC_DEFAULT = false
   public static readonly RPCPORT_DEFAULT = 8545

packages/client/test/config.spec.ts

@@ -1,6 +1,5 @@
 import tape from 'tape-catch'
 import { Config } from '../lib/config'
-const os = require('os')
 
 tape('[Config]', (t) => {
   t.test('Initialization with default parameters', (t) => {
@@ -17,19 +16,13 @@ tape('[Config]', (t) => {
 
   t.test('getChainDataDirectory() default directory', (t) => {
     const config = new Config()
-    t.equal(
-      config.getChainDataDirectory(),
-      `${os.homedir()}/Library/Ethereum/ethereumjs/mainnet/chain`
-    )
+    t.equal(config.getChainDataDirectory(), './datadir/mainnet/chain')
     t.end()
   })
 
   t.test('getStateDataDirectory() default directory', (t) => {
     const config = new Config()
-    t.equal(
-      config.getStateDataDirectory(),
-      `${os.homedir()}/Library/Ethereum/ethereumjs/mainnet/state`
-    )
+    t.equal(config.getStateDataDirectory(), './datadir/mainnet/state')
     t.end()
   })
 })