diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-06 00:10:42 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-06 00:10:42 +0800 |
| commit | 6abf8ef78f1474fdeb7a6a6ce084bf994cc055f2 (patch) | |
| tree | b898711590694cfaa6f10dbc2a4c8591232954ef /cmd/ethereum/main.go | |
| parent | b0854fbff5c3d588134f577918a39d08002235dc (diff) | |
| download | dexon-6abf8ef78f1474fdeb7a6a6ce084bf994cc055f2.tar dexon-6abf8ef78f1474fdeb7a6a6ce084bf994cc055f2.tar.gz dexon-6abf8ef78f1474fdeb7a6a6ce084bf994cc055f2.tar.bz2 dexon-6abf8ef78f1474fdeb7a6a6ce084bf994cc055f2.tar.lz dexon-6abf8ef78f1474fdeb7a6a6ce084bf994cc055f2.tar.xz dexon-6abf8ef78f1474fdeb7a6a6ce084bf994cc055f2.tar.zst dexon-6abf8ef78f1474fdeb7a6a6ce084bf994cc055f2.zip | |
Merge
Diffstat (limited to 'cmd/ethereum/main.go')
| -rw-r--r-- | cmd/ethereum/main.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index b23852282..8b83bbd37 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -64,10 +64,14 @@ func main() { NATType: PMPGateway, PMPGateway: PMPGateway, KeyRing: KeyRing, + Shh: SHH, + Dial: Dial, }) + if err != nil { clilogger.Fatalln(err) } + utils.KeyTasks(ethereum.KeyManager(), KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive) if Dump { @@ -112,13 +116,6 @@ func main() { return } - // better reworked as cases - if StartJsConsole { - InitJsConsole(ethereum) - } else if len(InputFile) > 0 { - ExecJsFile(ethereum, InputFile) - } - if StartRpc { utils.StartRpc(ethereum, RpcPort) } @@ -129,6 +126,11 @@ func main() { utils.StartEthereum(ethereum, UseSeed) + if StartJsConsole { + InitJsConsole(ethereum) + } else if len(InputFile) > 0 { + ExecJsFile(ethereum, InputFile) + } // this blocks the thread ethereum.WaitForShutdown() } |