diff options
Diffstat (limited to 'ethereum')
-rw-r--r-- | ethereum/cmd.go | 46 | ||||
-rw-r--r-- | ethereum/flags.go | 10 | ||||
-rw-r--r-- | ethereum/javascript_runtime.go | 4 | ||||
-rw-r--r-- | ethereum/main.go | 14 |
4 files changed, 37 insertions, 37 deletions
diff --git a/ethereum/cmd.go b/ethereum/cmd.go index 2dfd54666..08147824d 100644 --- a/ethereum/cmd.go +++ b/ethereum/cmd.go @@ -1,32 +1,32 @@ package main import ( - "github.com/ethereum/eth-go" - "github.com/ethereum/go-ethereum/utils" - "os" - "io/ioutil" + "github.com/ethereum/eth-go" + "github.com/ethereum/go-ethereum/utils" + "io/ioutil" + "os" ) func InitJsConsole(ethereum *eth.Ethereum) { - repl := NewJSRepl(ethereum) - go repl.Start() - utils.RegisterInterrupt(func(os.Signal) { - repl.Stop() - }) + repl := NewJSRepl(ethereum) + go repl.Start() + utils.RegisterInterrupt(func(os.Signal) { + repl.Stop() + }) } -func ExecJsFile (ethereum *eth.Ethereum, InputFile string) { - file, err := os.Open(InputFile) - if err != nil { - logger.Fatalln(err) - } - content, err := ioutil.ReadAll(file) - if err != nil { - logger.Fatalln(err) - } - re := NewJSRE(ethereum) - utils.RegisterInterrupt(func(os.Signal) { - re.Stop() - }) - re.Run(string(content)) +func ExecJsFile(ethereum *eth.Ethereum, InputFile string) { + file, err := os.Open(InputFile) + if err != nil { + logger.Fatalln(err) + } + content, err := ioutil.ReadAll(file) + if err != nil { + logger.Fatalln(err) + } + re := NewJSRE(ethereum) + utils.RegisterInterrupt(func(os.Signal) { + re.Stop() + }) + re.Run(string(content)) } diff --git a/ethereum/flags.go b/ethereum/flags.go index 232a2bc92..8fb87cf34 100644 --- a/ethereum/flags.go +++ b/ethereum/flags.go @@ -3,10 +3,10 @@ package main import ( "flag" "fmt" + "github.com/ethereum/eth-go/ethlog" "os" - "os/user" - "path" - "github.com/ethereum/eth-go/ethlog" + "os/user" + "path" ) var Identifier string @@ -34,8 +34,8 @@ var StartJsConsole bool var InputFile string func defaultDataDir() string { - usr, _ := user.Current() - return path.Join(usr.HomeDir, ".ethereum") + usr, _ := user.Current() + return path.Join(usr.HomeDir, ".ethereum") } var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index 0a9a882ad..0dfe07a54 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -1,12 +1,12 @@ - package main +package main import ( "fmt" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" + "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/obscuren/otto" "io/ioutil" diff --git a/ethereum/main.go b/ethereum/main.go index 93b2b47d3..6b1995eec 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/ethereum/go-ethereum/utils" "github.com/ethereum/eth-go/ethlog" + "github.com/ethereum/go-ethereum/utils" "runtime" ) @@ -24,11 +24,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 StartMining { utils.StartMining(ethereum) @@ -48,6 +48,6 @@ func main() { utils.StartEthereum(ethereum, UseSeed) // this blocks the thread - ethereum.WaitForShutdown() - ethlog.Flush() + ethereum.WaitForShutdown() + ethlog.Flush() } |