diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-15 06:37:21 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-15 06:37:21 +0800 |
| commit | d9966d615813130c8d31b3b10a59d43d00fd9943 (patch) | |
| tree | b5a196dd1ef20050160eb384c876ccaba1c4eebf /cmd/ethereum/main.go | |
| parent | 12cee1377f8795608bae3cad38ee22c032b3b865 (diff) | |
| parent | 67f8f83a1ba2a4dbd0f6f2fd075bb440f5c420ad (diff) | |
| download | go-tangerine-d9966d615813130c8d31b3b10a59d43d00fd9943.tar go-tangerine-d9966d615813130c8d31b3b10a59d43d00fd9943.tar.gz go-tangerine-d9966d615813130c8d31b3b10a59d43d00fd9943.tar.bz2 go-tangerine-d9966d615813130c8d31b3b10a59d43d00fd9943.tar.lz go-tangerine-d9966d615813130c8d31b3b10a59d43d00fd9943.tar.xz go-tangerine-d9966d615813130c8d31b3b10a59d43d00fd9943.tar.zst go-tangerine-d9966d615813130c8d31b3b10a59d43d00fd9943.zip | |
merge
Diffstat (limited to 'cmd/ethereum/main.go')
| -rw-r--r-- | cmd/ethereum/main.go | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 4cb2d9979..53746627a 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -53,6 +53,7 @@ func init() { app.Action = run app.HideVersion = true // we have a command to print the version app.Commands = []cli.Command{ + blocktestCmd, { Action: version, Name: "version", @@ -156,24 +157,26 @@ func main() { func run(ctx *cli.Context) { fmt.Printf("Welcome to the FRONTIER\n") utils.HandleInterrupt() - eth, err := utils.GetEthereum(ClientIdentifier, Version, ctx) + cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) + ethereum, err := eth.New(cfg) if err != nil { utils.Fatalf("%v", err) } - startEth(ctx, eth) + startEth(ctx, ethereum) // this blocks the thread - eth.WaitForShutdown() + ethereum.WaitForShutdown() } func runjs(ctx *cli.Context) { - eth, err := utils.GetEthereum(ClientIdentifier, Version, ctx) + cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) + ethereum, err := eth.New(cfg) if err != nil { utils.Fatalf("%v", err) } - startEth(ctx, eth) - repl := newJSRE(eth) + startEth(ctx, ethereum) + repl := newJSRE(ethereum) if len(ctx.Args()) == 0 { repl.interactive() } else { @@ -181,8 +184,8 @@ func runjs(ctx *cli.Context) { repl.exec(file) } } - eth.Stop() - eth.WaitForShutdown() + ethereum.Stop() + ethereum.WaitForShutdown() } func startEth(ctx *cli.Context, eth *eth.Ethereum) { |