From e43e4ff2c1d882ec96424ced1cf8980e14636afd Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Sun, 29 Jun 2014 20:32:31 +0100
Subject: [PATCH] main loop uses new flags and common methods in util: db,
keymanager set up; passes KeyRing/Session string to gui
---
ethereal/main.go | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/ethereal/main.go b/ethereal/main.go
index 316f2285f..82427f088 100644
--- a/ethereal/main.go
+++ b/ethereal/main.go
@@ -30,10 +30,14 @@ func main() {
utils.InitLogging(Datadir, LogFile, LogLevel, DebugFile)
- ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer)
+ db := utils.NewDatabase()
+
+ keyManager := utils.NewKeyManager(KeyStore, Datadir, db)
// create, import, export keys
- utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive)
+ utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive)
+
+ ethereum := utils.NewEthereum(db, keyManager, UseUPnP, OutboundPort, MaxPeer)
if ShowGenesis {
utils.ShowGenesis(ethereum)
@@ -43,7 +47,7 @@ func main() {
utils.StartRpc(ethereum, RpcPort)
}
- gui := ethui.New(ethereum, LogLevel)
+ gui := ethui.New(ethereum, KeyRing, LogLevel)
utils.RegisterInterrupt(func(os.Signal) {
gui.Stop()
--
GitLab