From 08b21acff1ca397e775e926e0f9a96deaa9820fd Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sun, 22 Mar 2015 13:32:52 +0100 Subject: Move ToHex/FromHex into bytes --- common/common.go | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'common/common.go') diff --git a/common/common.go b/common/common.go index 155bb5c2a..a61b866c9 100644 --- a/common/common.go +++ b/common/common.go @@ -65,27 +65,6 @@ func DefaultDataDir() string { } } -func ToHex(b []byte) string { - hex := Bytes2Hex(b) - // Prefer output of "0x0" instead of "0x" - if len(hex) == 0 { - hex = "0" - } - return "0x" + hex -} - -func FromHex(s string) []byte { - if len(s) > 1 { - if s[0:2] == "0x" { - s = s[2:] - } - if len(s)%2 == 1 { - s = "0" + s - } - return Hex2Bytes(s) - } - return nil -} func IsWindows() bool { return runtime.GOOS == "windows" } -- cgit v1.2.3 From 82a41a198e3ac217e1c349c7300b1fb28e4982ab Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sun, 22 Mar 2015 13:35:13 +0100 Subject: Move CurrencyToString to size --- common/common.go | 57 -------------------------------------------------------- 1 file changed, 57 deletions(-) (limited to 'common/common.go') diff --git a/common/common.go b/common/common.go index a61b866c9..9045151f5 100644 --- a/common/common.go +++ b/common/common.go @@ -76,63 +76,6 @@ func WindonizePath(path string) string { return path } -// The different number of units -var ( - Douglas = BigPow(10, 42) - Einstein = BigPow(10, 21) - Ether = BigPow(10, 18) - Finney = BigPow(10, 15) - Szabo = BigPow(10, 12) - Shannon = BigPow(10, 9) - Babbage = BigPow(10, 6) - Ada = BigPow(10, 3) - Wei = big.NewInt(1) -) - -// -// Currency to string -// Returns a string representing a human readable format -func CurrencyToString(num *big.Int) string { - var ( - fin *big.Int = num - denom string = "Wei" - ) - - switch { - case num.Cmp(Douglas) >= 0: - fin = new(big.Int).Div(num, Douglas) - denom = "Douglas" - case num.Cmp(Einstein) >= 0: - fin = new(big.Int).Div(num, Einstein) - denom = "Einstein" - case num.Cmp(Ether) >= 0: - fin = new(big.Int).Div(num, Ether) - denom = "Ether" - case num.Cmp(Finney) >= 0: - fin = new(big.Int).Div(num, Finney) - denom = "Finney" - case num.Cmp(Szabo) >= 0: - fin = new(big.Int).Div(num, Szabo) - denom = "Szabo" - case num.Cmp(Shannon) >= 0: - fin = new(big.Int).Div(num, Shannon) - denom = "Shannon" - case num.Cmp(Babbage) >= 0: - fin = new(big.Int).Div(num, Babbage) - denom = "Babbage" - case num.Cmp(Ada) >= 0: - fin = new(big.Int).Div(num, Ada) - denom = "Ada" - } - - // TODO add comment clarifying expected behavior - if len(fin.String()) > 5 { - return fmt.Sprintf("%sE%d %s", fin.String()[0:5], len(fin.String())-5, denom) - } - - return fmt.Sprintf("%v %s", fin, denom) -} - // Common big integers often used var ( Big1 = big.NewInt(1) -- cgit v1.2.3 From c0741edc34c3d09b69c7a64a97aaca0e7759add1 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sun, 22 Mar 2015 13:44:17 +0100 Subject: Move OS-specific funcs to path.go --- common/common.go | 62 -------------------------------------------------------- 1 file changed, 62 deletions(-) (limited to 'common/common.go') diff --git a/common/common.go b/common/common.go index 9045151f5..b5eacfdb7 100644 --- a/common/common.go +++ b/common/common.go @@ -3,14 +3,8 @@ package common import ( "fmt" "math/big" - "os" - "os/user" - "path" - "path/filepath" "runtime" "time" - - "github.com/kardianos/osext" ) // MakeName creates a node name that follows the ethereum convention @@ -20,62 +14,6 @@ func MakeName(name, version string) string { return fmt.Sprintf("%s/v%s/%s/%s", name, version, runtime.GOOS, runtime.Version()) } -func DefaultAssetPath() string { - var assetPath string - pwd, _ := os.Getwd() - srcdir := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist") - - // If the current working directory is the go-ethereum dir - // assume a debug build and use the source directory as - // asset directory. - if pwd == srcdir { - assetPath = path.Join(pwd, "assets") - } else { - switch runtime.GOOS { - case "darwin": - // Get Binary Directory - exedir, _ := osext.ExecutableFolder() - assetPath = filepath.Join(exedir, "../Resources") - case "linux": - assetPath = "/usr/share/mist" - case "windows": - assetPath = "./assets" - default: - assetPath = "." - } - } - - // Check if the assetPath exists. If not, try the source directory - // This happens when binary is run from outside cmd/mist directory - if _, err := os.Stat(assetPath); os.IsNotExist(err) { - assetPath = path.Join(srcdir, "assets") - } - - return assetPath -} - -func DefaultDataDir() string { - usr, _ := user.Current() - if runtime.GOOS == "darwin" { - return path.Join(usr.HomeDir, "Library/Ethereum") - } else if runtime.GOOS == "windows" { - return path.Join(usr.HomeDir, "AppData/Roaming/Ethereum") - } else { - return path.Join(usr.HomeDir, ".ethereum") - } -} - -func IsWindows() bool { - return runtime.GOOS == "windows" -} - -func WindonizePath(path string) string { - if string(path[0]) == "/" && IsWindows() { - path = path[1:] - } - return path -} - // Common big integers often used var ( Big1 = big.NewInt(1) -- cgit v1.2.3 From 2477d10aa0ac80b0735f3069a214c804cd6be957 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sun, 22 Mar 2015 13:46:21 +0100 Subject: Move MakeName to path --- common/common.go | 8 -------- 1 file changed, 8 deletions(-) (limited to 'common/common.go') diff --git a/common/common.go b/common/common.go index b5eacfdb7..6c5a69d18 100644 --- a/common/common.go +++ b/common/common.go @@ -3,17 +3,9 @@ package common import ( "fmt" "math/big" - "runtime" "time" ) -// MakeName creates a node name that follows the ethereum convention -// for such names. It adds the operation system name and Go runtime version -// the name. -func MakeName(name, version string) string { - return fmt.Sprintf("%s/v%s/%s/%s", name, version, runtime.GOOS, runtime.Version()) -} - // Common big integers often used var ( Big1 = big.NewInt(1) -- cgit v1.2.3 From 360c66c65d546cfbe3d2d910b13377485ba66e1f Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sun, 22 Mar 2015 13:46:38 +0100 Subject: Move Big* vars to big.go --- common/common.go | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'common/common.go') diff --git a/common/common.go b/common/common.go index 6c5a69d18..53709bb72 100644 --- a/common/common.go +++ b/common/common.go @@ -2,23 +2,9 @@ package common import ( "fmt" - "math/big" "time" ) -// Common big integers often used -var ( - Big1 = big.NewInt(1) - Big2 = big.NewInt(2) - Big3 = big.NewInt(3) - Big0 = big.NewInt(0) - BigTrue = Big1 - BigFalse = Big0 - Big32 = big.NewInt(32) - Big256 = big.NewInt(0xff) - Big257 = big.NewInt(257) -) - func Bench(pre string, cb func()) { start := time.Now() cb() -- cgit v1.2.3 From bf73f02fe040086ac7c9786a15fadc65840a8536 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sun, 22 Mar 2015 13:48:07 +0100 Subject: Remove common.go --- common/common.go | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 common/common.go (limited to 'common/common.go') diff --git a/common/common.go b/common/common.go deleted file mode 100644 index 53709bb72..000000000 --- a/common/common.go +++ /dev/null @@ -1,12 +0,0 @@ -package common - -import ( - "fmt" - "time" -) - -func Bench(pre string, cb func()) { - start := time.Now() - cb() - fmt.Println(pre, ": took:", time.Since(start)) -} -- cgit v1.2.3