Skip to content

Commit ae5ace1

Browse files
zeligzelig
committed
go fmt
1 parent 648c418 commit ae5ace1

File tree

8 files changed

+226
-226
lines changed

8 files changed

+226
-226
lines changed

‎ethereal/flags.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package main
22

33
import (
4+
"bitbucket.org/kardianos/osext"
5+
"flag"
46
"fmt"
7+
"github.com/ethereum/eth-go/ethlog"
58
"os"
6-
"os/user"
7-
"path"
8-
"github.com/ethereum/eth-go/ethlog"
9-
"flag"
10-
"bitbucket.org/kardianos/osext"
9+
"os/user"
10+
"path"
1111
"path/filepath"
1212
"runtime"
1313
)
@@ -60,8 +60,8 @@ func defaultAssetPath() string {
6060
}
6161

6262
func defaultDataDir() string {
63-
usr, _ := user.Current()
64-
return path.Join(usr.HomeDir, ".ethereal")
63+
usr, _ := user.Current()
64+
return path.Join(usr.HomeDir, ".ethereal")
6565
}
6666

6767
var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini")

‎ethereal/main.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package main
22

33
import (
4+
"github.com/ethereum/eth-go/ethlog"
45
"github.com/ethereum/go-ethereum/ethereal/ui"
56
"github.com/ethereum/go-ethereum/utils"
6-
"github.com/ethereum/eth-go/ethlog"
77
"github.com/go-qml/qml"
8-
"runtime"
98
"os"
9+
"runtime"
1010
)
1111

1212
func main() {
@@ -32,11 +32,11 @@ func main() {
3232
ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer)
3333

3434
// create, import, export keys
35-
utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive)
35+
utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive)
3636

37-
if ShowGenesis {
38-
utils.ShowGenesis(ethereum)
39-
}
37+
if ShowGenesis {
38+
utils.ShowGenesis(ethereum)
39+
}
4040

4141
if StartRpc {
4242
utils.StartRpc(ethereum, RpcPort)
@@ -45,17 +45,17 @@ func main() {
4545
gui := ethui.New(ethereum, LogLevel)
4646

4747
utils.RegisterInterrupt(func(os.Signal) {
48-
gui.Stop()
49-
})
48+
gui.Stop()
49+
})
5050
utils.StartEthereum(ethereum, UseSeed)
51-
// gui blocks the main thread
52-
gui.Start(AssetPath)
53-
// we need to run the interrupt callbacks in case gui is closed
54-
// this skips if we got here by actual interrupt stopping the GUI
51+
// gui blocks the main thread
52+
gui.Start(AssetPath)
53+
// we need to run the interrupt callbacks in case gui is closed
54+
// this skips if we got here by actual interrupt stopping the GUI
5555
if !interrupted {
5656
utils.RunInterruptCallbacks(os.Interrupt)
57-
}
58-
// this blocks the thread
59-
ethereum.WaitForShutdown()
60-
ethlog.Flush()
57+
}
58+
// this blocks the thread
59+
ethereum.WaitForShutdown()
60+
ethlog.Flush()
6161
}

‎ethereal/ui/gui.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"github.com/ethereum/eth-go"
77
"github.com/ethereum/eth-go/ethchain"
88
"github.com/ethereum/eth-go/ethdb"
9+
"github.com/ethereum/eth-go/ethlog"
910
"github.com/ethereum/eth-go/ethpub"
1011
"github.com/ethereum/eth-go/ethutil"
11-
"github.com/ethereum/eth-go/ethlog"
1212
"github.com/ethereum/go-ethereum/utils"
1313
"github.com/go-qml/qml"
1414
"math/big"
@@ -35,9 +35,9 @@ type Gui struct {
3535

3636
addr []byte
3737

38-
pub *ethpub.PEthereum
38+
pub *ethpub.PEthereum
3939
logLevel ethlog.LogLevel
40-
open bool
40+
open bool
4141
}
4242

4343
// Create GUI, but doesn't start it

‎ethereum/cmd.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
package main
22

33
import (
4-
"github.com/ethereum/eth-go"
5-
"github.com/ethereum/go-ethereum/utils"
6-
"os"
7-
"io/ioutil"
4+
"github.com/ethereum/eth-go"
5+
"github.com/ethereum/go-ethereum/utils"
6+
"io/ioutil"
7+
"os"
88
)
99

1010
func InitJsConsole(ethereum *eth.Ethereum) {
11-
repl := NewJSRepl(ethereum)
12-
go repl.Start()
13-
utils.RegisterInterrupt(func(os.Signal) {
14-
repl.Stop()
15-
})
11+
repl := NewJSRepl(ethereum)
12+
go repl.Start()
13+
utils.RegisterInterrupt(func(os.Signal) {
14+
repl.Stop()
15+
})
1616
}
1717

18-
func ExecJsFile (ethereum *eth.Ethereum, InputFile string) {
19-
file, err := os.Open(InputFile)
20-
if err != nil {
21-
logger.Fatalln(err)
22-
}
23-
content, err := ioutil.ReadAll(file)
24-
if err != nil {
25-
logger.Fatalln(err)
26-
}
27-
re := NewJSRE(ethereum)
28-
utils.RegisterInterrupt(func(os.Signal) {
29-
re.Stop()
30-
})
31-
re.Run(string(content))
18+
func ExecJsFile(ethereum *eth.Ethereum, InputFile string) {
19+
file, err := os.Open(InputFile)
20+
if err != nil {
21+
logger.Fatalln(err)
22+
}
23+
content, err := ioutil.ReadAll(file)
24+
if err != nil {
25+
logger.Fatalln(err)
26+
}
27+
re := NewJSRE(ethereum)
28+
utils.RegisterInterrupt(func(os.Signal) {
29+
re.Stop()
30+
})
31+
re.Run(string(content))
3232
}

‎ethereum/flags.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package main
33
import (
44
"flag"
55
"fmt"
6+
"github.com/ethereum/eth-go/ethlog"
67
"os"
7-
"os/user"
8-
"path"
9-
"github.com/ethereum/eth-go/ethlog"
8+
"os/user"
9+
"path"
1010
)
1111

1212
var Identifier string
@@ -34,8 +34,8 @@ var StartJsConsole bool
3434
var InputFile string
3535

3636
func defaultDataDir() string {
37-
usr, _ := user.Current()
38-
return path.Join(usr.HomeDir, ".ethereum")
37+
usr, _ := user.Current()
38+
return path.Join(usr.HomeDir, ".ethereum")
3939
}
4040

4141
var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini")

‎ethereum/javascript_runtime.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package main
1+
package main
22

33
import (
44
"fmt"
55
"github.com/ethereum/eth-go"
66
"github.com/ethereum/eth-go/ethchain"
7+
"github.com/ethereum/eth-go/ethlog"
78
"github.com/ethereum/eth-go/ethpub"
89
"github.com/ethereum/eth-go/ethutil"
9-
"github.com/ethereum/eth-go/ethlog"
1010
"github.com/ethereum/go-ethereum/utils"
1111
"github.com/obscuren/otto"
1212
"io/ioutil"

‎ethereum/main.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
"github.com/ethereum/go-ethereum/utils"
54
"github.com/ethereum/eth-go/ethlog"
5+
"github.com/ethereum/go-ethereum/utils"
66
"runtime"
77
)
88

@@ -24,11 +24,11 @@ func main() {
2424
ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer)
2525

2626
// create, import, export keys
27-
utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive)
27+
utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive)
2828

29-
if ShowGenesis {
30-
utils.ShowGenesis(ethereum)
31-
}
29+
if ShowGenesis {
30+
utils.ShowGenesis(ethereum)
31+
}
3232

3333
if StartMining {
3434
utils.StartMining(ethereum)
@@ -48,6 +48,6 @@ func main() {
4848
utils.StartEthereum(ethereum, UseSeed)
4949

5050
// this blocks the thread
51-
ethereum.WaitForShutdown()
52-
ethlog.Flush()
51+
ethereum.WaitForShutdown()
52+
ethlog.Flush()
5353
}

0 commit comments

Comments
 (0)