Merge pull request #150 from fjl/develop

Merge eth-go repo into go-ethereum

1 files changed, 0 insertions, 95 deletions

diff --git a/mist/main.go b/mist/main.go
deleted file mode 100644
index 116bd78fd..000000000
--- a/mist/main.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package main
-
-import (
-	"os"
-	"runtime"
-
-	"github.com/ethereum/eth-go"
-	"github.com/ethereum/eth-go/ethlog"
-	"github.com/ethereum/go-ethereum/utils"
-	"gopkg.in/qml.v1"
-)
-
-const (
-	ClientIdentifier = "Mist"
-	Version          = "0.7.1"
-)
-
-var ethereum *eth.Ethereum
-
-func run() error {
-	// precedence: code-internal flag default < config file < environment variables < command line
-	Init() // parsing command line
-
-	config := utils.InitConfig(VmType, ConfigFile, Datadir, "ETH")
-
-	utils.InitDataDir(Datadir)
-
-	stdLog := utils.InitLogging(Datadir, LogFile, LogLevel, DebugFile)
-
-	db := utils.NewDatabase()
-	err := utils.DBSanityCheck(db)
-	if err != nil {
-		ErrorWindow(err)
-
-		os.Exit(1)
-	}
-
-	keyManager := utils.NewKeyManager(KeyStore, Datadir, db)
-
-	// create, import, export keys
-	utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive)
-
-	clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier)
-
-	ethereum = utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer)
-
-	if ShowGenesis {
-		utils.ShowGenesis(ethereum)
-	}
-
-	if StartRpc {
-		utils.StartRpc(ethereum, RpcPort)
-	}
-
-	gui := NewWindow(ethereum, config, clientIdentity, KeyRing, LogLevel)
-	gui.stdLog = stdLog
-
-	utils.RegisterInterrupt(func(os.Signal) {
-		gui.Stop()
-	})
-	utils.StartEthereum(ethereum, UseSeed)
-	// gui blocks the main thread
-	gui.Start(AssetPath)
-
-	return nil
-}
-
-func main() {
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	// This is a bit of a cheat, but ey!
-	os.Setenv("QTWEBKIT_INSPECTOR_SERVER", "127.0.0.1:99999")
-
-	qml.Run(run)
-
-	var interrupted = false
-	utils.RegisterInterrupt(func(os.Signal) {
-		interrupted = true
-	})
-
-	utils.HandleInterrupt()
-
-	if StartWebSockets {
-		utils.StartWebSockets(ethereum)
-	}
-
-	// we need to run the interrupt callbacks in case gui is closed
-	// this skips if we got here by actual interrupt stopping the GUI
-	if !interrupted {
-		utils.RunInterruptCallbacks(os.Interrupt)
-	}
-	// this blocks the thread
-	ethereum.WaitForShutdown()
-	ethlog.Flush()
-}