diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-20 05:46:15 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-20 05:46:15 +0800 |
| commit | 000658539136645e743d83d57a8106b2a9796b93 (patch) | |
| tree | ca37fb68b6b7574d7c888968813598e68d301659 /cmd/mist/main.go | |
| parent | fa4cbad315609e41d88c59ecbce7c6c6169fc57a (diff) | |
| parent | 639ac5c3daa253f36d41672165a5727d8eba207e (diff) | |
| download | dexon-000658539136645e743d83d57a8106b2a9796b93.tar dexon-000658539136645e743d83d57a8106b2a9796b93.tar.gz dexon-000658539136645e743d83d57a8106b2a9796b93.tar.bz2 dexon-000658539136645e743d83d57a8106b2a9796b93.tar.lz dexon-000658539136645e743d83d57a8106b2a9796b93.tar.xz dexon-000658539136645e743d83d57a8106b2a9796b93.tar.zst dexon-000658539136645e743d83d57a8106b2a9796b93.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/mist/main.go')
| -rw-r--r-- | cmd/mist/main.go | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go index 14f561e99..d41aa34bf 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -52,19 +52,20 @@ func run() error { config := utils.InitConfig(VmType, ConfigFile, Datadir, "ETH") ethereum, err := eth.New(ð.Config{ - Name: p2p.MakeName(ClientIdentifier, Version), - KeyStore: KeyStore, - DataDir: Datadir, - LogFile: LogFile, - LogLevel: LogLevel, - MaxPeers: MaxPeer, - Port: OutboundPort, - NAT: NAT, - Shh: true, - BootNodes: BootNodes, - NodeKey: NodeKey, - KeyRing: KeyRing, - Dial: true, + Name: p2p.MakeName(ClientIdentifier, Version), + KeyStore: KeyStore, + DataDir: Datadir, + LogFile: LogFile, + LogLevel: LogLevel, + MaxPeers: MaxPeer, + Port: OutboundPort, + NAT: NAT, + Shh: true, + BootNodes: BootNodes, + NodeKey: NodeKey, + KeyRing: KeyRing, + Dial: true, + MinerThreads: MinerThreads, }) if err != nil { mainlogger.Fatalln(err) |