gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd/utils: GetEthereum -> MakeEthConfig

Browse Source 
This allows changing the config before starting Ethereum
with it.
This commit is contained in:
Felix Lange
2015-03-13 18:30:45 +01:00
parent a80be98f31
commit 58d9d98daf
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/ethereum/main.go
View File

@ -156,24 +156,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 +183,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) {