go fmt
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"os/user"
|
||||
"path"
|
||||
"github.com/ethereum/eth-go/ethlog"
|
||||
"flag"
|
||||
"bitbucket.org/kardianos/osext"
|
||||
"flag"
|
||||
"fmt"
|
||||
"github.com/ethereum/eth-go/ethlog"
|
||||
"os"
|
||||
"os/user"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
)
|
||||
@@ -60,8 +60,8 @@ func defaultAssetPath() string {
|
||||
}
|
||||
|
||||
func defaultDataDir() string {
|
||||
usr, _ := user.Current()
|
||||
return path.Join(usr.HomeDir, ".ethereal")
|
||||
usr, _ := user.Current()
|
||||
return path.Join(usr.HomeDir, ".ethereal")
|
||||
}
|
||||
|
||||
var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini")
|
||||
|
@@ -1,12 +1,12 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"github.com/ethereum/eth-go/ethlog"
|
||||
"github.com/ethereum/go-ethereum/ethereal/ui"
|
||||
"github.com/ethereum/go-ethereum/utils"
|
||||
"github.com/ethereum/eth-go/ethlog"
|
||||
"github.com/go-qml/qml"
|
||||
"runtime"
|
||||
"os"
|
||||
"runtime"
|
||||
)
|
||||
|
||||
func main() {
|
||||
@@ -32,11 +32,11 @@ func main() {
|
||||
ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer)
|
||||
|
||||
// create, import, export keys
|
||||
utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive)
|
||||
utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive)
|
||||
|
||||
if ShowGenesis {
|
||||
utils.ShowGenesis(ethereum)
|
||||
}
|
||||
if ShowGenesis {
|
||||
utils.ShowGenesis(ethereum)
|
||||
}
|
||||
|
||||
if StartRpc {
|
||||
utils.StartRpc(ethereum, RpcPort)
|
||||
@@ -45,17 +45,17 @@ func main() {
|
||||
gui := ethui.New(ethereum, LogLevel)
|
||||
|
||||
utils.RegisterInterrupt(func(os.Signal) {
|
||||
gui.Stop()
|
||||
})
|
||||
gui.Stop()
|
||||
})
|
||||
utils.StartEthereum(ethereum, UseSeed)
|
||||
// gui blocks the main thread
|
||||
gui.Start(AssetPath)
|
||||
// we need to run the interrupt callbacks in case gui is closed
|
||||
// this skips if we got here by actual interrupt stopping the GUI
|
||||
// gui blocks the main thread
|
||||
gui.Start(AssetPath)
|
||||
// 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()
|
||||
}
|
||||
// this blocks the thread
|
||||
ethereum.WaitForShutdown()
|
||||
ethlog.Flush()
|
||||
}
|
||||
|
@@ -6,9 +6,9 @@ import (
|
||||
"github.com/ethereum/eth-go"
|
||||
"github.com/ethereum/eth-go/ethchain"
|
||||
"github.com/ethereum/eth-go/ethdb"
|
||||
"github.com/ethereum/eth-go/ethlog"
|
||||
"github.com/ethereum/eth-go/ethpub"
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
"github.com/ethereum/eth-go/ethlog"
|
||||
"github.com/ethereum/go-ethereum/utils"
|
||||
"github.com/go-qml/qml"
|
||||
"math/big"
|
||||
@@ -35,9 +35,9 @@ type Gui struct {
|
||||
|
||||
addr []byte
|
||||
|
||||
pub *ethpub.PEthereum
|
||||
pub *ethpub.PEthereum
|
||||
logLevel ethlog.LogLevel
|
||||
open bool
|
||||
open bool
|
||||
}
|
||||
|
||||
// Create GUI, but doesn't start it
|
||||
|
Reference in New Issue
Block a user