From ae5ace16190d48bfe7a0364fdb0b51644518ec42 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Thu, 26 Jun 2014 18:41:36 +0100
Subject: go fmt
---
ethereal/flags.go | 14 +++++++-------
ethereal/main.go | 32 ++++++++++++++++----------------
ethereal/ui/gui.go | 6 +++---
3 files changed, 26 insertions(+), 26 deletions(-)
(limited to 'ethereal')
diff --git a/ethereal/flags.go b/ethereal/flags.go
index 7e83e355f..9bed38d9f 100644
--- a/ethereal/flags.go
+++ b/ethereal/flags.go
@@ -1,13 +1,13 @@
package main
import (
+ "bitbucket.org/kardianos/osext"
+ "flag"
"fmt"
+ "github.com/ethereum/eth-go/ethlog"
"os"
- "os/user"
- "path"
- "github.com/ethereum/eth-go/ethlog"
- "flag"
- "bitbucket.org/kardianos/osext"
+ "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")
diff --git a/ethereal/main.go b/ethereal/main.go
index cfd85afe7..799b50e4b 100644
--- a/ethereal/main.go
+++ b/ethereal/main.go
@@ -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()
}
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 83b1508e9..be7b395d8 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -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
--
cgit v1.2.3