aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-11-19 02:48:35 +0800
committerobscuren <geffobscura@gmail.com>2014-11-19 02:48:35 +0800
commit675ba4d7eb7ab96fa74b803085f042a25f8d8d42 (patch)
treecc8ee5c2cd3f80e943a336d9820539ea2ebce4d2 /cmd
parentf8d0cd9906a1ec4a4a1e95868a279312363f8b49 (diff)
parent5c958ec5f658709b648647449ce5349aa98b3d5d (diff)
downloaddexon-675ba4d7eb7ab96fa74b803085f042a25f8d8d42.tar
dexon-675ba4d7eb7ab96fa74b803085f042a25f8d8d42.tar.gz
dexon-675ba4d7eb7ab96fa74b803085f042a25f8d8d42.tar.bz2
dexon-675ba4d7eb7ab96fa74b803085f042a25f8d8d42.tar.lz
dexon-675ba4d7eb7ab96fa74b803085f042a25f8d8d42.tar.xz
dexon-675ba4d7eb7ab96fa74b803085f042a25f8d8d42.tar.zst
dexon-675ba4d7eb7ab96fa74b803085f042a25f8d8d42.zip
Merge branch 'tests' into poc8
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ethereum/main.go3
-rw-r--r--cmd/ethereum/repl/repl_windows.go14
2 files changed, 9 insertions, 8 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index ed42dfafb..c894a8f85 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -93,7 +93,8 @@ func main() {
os.Exit(1)
}
- fmt.Printf("RLP: %x\nstate: %x\nhash: %x\n", ethutil.Rlp(block), block.GetRoot(), block.Hash())
+ // block.GetRoot() does not exist
+ //fmt.Printf("RLP: %x\nstate: %x\nhash: %x\n", ethutil.Rlp(block), block.GetRoot(), block.Hash())
// Leave the Println. This needs clean output for piping
fmt.Printf("%s\n", block.State().Dump())
diff --git a/cmd/ethereum/repl/repl_windows.go b/cmd/ethereum/repl/repl_windows.go
index 9b1eb3b7d..d2c405ee9 100644
--- a/cmd/ethereum/repl/repl_windows.go
+++ b/cmd/ethereum/repl/repl_windows.go
@@ -32,7 +32,7 @@ func (self *JSRepl) read() {
if err != nil {
fmt.Println("Error reading input", err)
} else {
- if (string(str) == "exit") {
+ if string(str) == "exit" {
self.Stop()
break
} else {
@@ -46,25 +46,25 @@ func addHistory(s string) {
}
func printColored(outputVal string) {
- for ; outputVal != "" ; {
+ for outputVal != "" {
codePart := ""
- if (strings.HasPrefix(outputVal, "\033[32m")) {
+ if strings.HasPrefix(outputVal, "\033[32m") {
codePart = "\033[32m"
changeColor(2)
}
- if (strings.HasPrefix(outputVal, "\033[1m\033[30m")) {
+ if strings.HasPrefix(outputVal, "\033[1m\033[30m") {
codePart = "\033[1m\033[30m"
changeColor(8)
}
- if (strings.HasPrefix(outputVal, "\033[31m")) {
+ if strings.HasPrefix(outputVal, "\033[31m") {
codePart = "\033[31m"
changeColor(red)
}
- if (strings.HasPrefix(outputVal, "\033[35m")) {
+ if strings.HasPrefix(outputVal, "\033[35m") {
codePart = "\033[35m"
changeColor(5)
}
- if (strings.HasPrefix(outputVal, "\033[0m")) {
+ if strings.HasPrefix(outputVal, "\033[0m") {
codePart = "\033[0m"
resetColorful()
}