main loop uses new flags and common methods in util: db, keymanager set up

11 years ago · 27e1352c85
parent 0ea9595d41
commit 27e1352c85
1 changed files with 6 additions and 2 deletions
--- a/ethereum/main.go
+++ b/ethereum/main.go
@ -21,10 +21,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)