aboutsummaryrefslogtreecommitdiffstats
path: root/ethutil
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-07-26 17:24:44 +0800
committerobscuren <geffobscura@gmail.com>2014-07-26 17:24:44 +0800
commit41bd38147c2e5968283facf641b2444c09f53d14 (patch)
tree69353d4174e2a244c48eb1faa37d74077b9495d2 /ethutil
parent92ffc1cc4c7227de93d933181a30c57c5730c41f (diff)
downloaddexon-41bd38147c2e5968283facf641b2444c09f53d14.tar
dexon-41bd38147c2e5968283facf641b2444c09f53d14.tar.gz
dexon-41bd38147c2e5968283facf641b2444c09f53d14.tar.bz2
dexon-41bd38147c2e5968283facf641b2444c09f53d14.tar.lz
dexon-41bd38147c2e5968283facf641b2444c09f53d14.tar.xz
dexon-41bd38147c2e5968283facf641b2444c09f53d14.tar.zst
dexon-41bd38147c2e5968283facf641b2444c09f53d14.zip
Clean up and util methods
Diffstat (limited to 'ethutil')
-rw-r--r--ethutil/bytes.go1
-rw-r--r--ethutil/config.go6
-rw-r--r--ethutil/path.go40
3 files changed, 44 insertions, 3 deletions
diff --git a/ethutil/bytes.go b/ethutil/bytes.go
index 34fff7d42..53b8cf645 100644
--- a/ethutil/bytes.go
+++ b/ethutil/bytes.go
@@ -98,6 +98,7 @@ func Bytes2Hex(d []byte) string {
func Hex2Bytes(str string) []byte {
h, _ := hex.DecodeString(str)
+
return h
}
diff --git a/ethutil/config.go b/ethutil/config.go
index 41bece21d..81052318e 100644
--- a/ethutil/config.go
+++ b/ethutil/config.go
@@ -3,8 +3,9 @@ package ethutil
import (
"flag"
"fmt"
- "github.com/rakyll/globalconf"
"os"
+
+ "github.com/rakyll/globalconf"
)
// Config struct
@@ -28,8 +29,7 @@ var Config *ConfigManager
func ReadConfig(ConfigFile string, Datadir string, EnvPrefix string) *ConfigManager {
if Config == nil {
// create ConfigFile if does not exist, otherwise globalconf panic when trying to persist flags
- _, err := os.Stat(ConfigFile)
- if err != nil && os.IsNotExist(err) {
+ if !FileExist(ConfigFile) {
fmt.Printf("config file '%s' doesn't exist, creating it\n", ConfigFile)
os.Create(ConfigFile)
}
diff --git a/ethutil/path.go b/ethutil/path.go
index 97f58ab7e..27022bcfa 100644
--- a/ethutil/path.go
+++ b/ethutil/path.go
@@ -1,6 +1,8 @@
package ethutil
import (
+ "io/ioutil"
+ "os"
"os/user"
"strings"
)
@@ -18,3 +20,41 @@ func ExpandHomePath(p string) (path string) {
return
}
+
+func FileExist(filePath string) bool {
+ _, err := os.Stat(filePath)
+ if err != nil && os.IsNotExist(err) {
+ return false
+ }
+
+ return true
+}
+
+func ReadAllFile(filePath string) (string, error) {
+ file, err := os.Open(filePath)
+ if err != nil {
+ return "", err
+ }
+
+ data, err := ioutil.ReadAll(file)
+ if err != nil {
+ return "", err
+ }
+
+ return string(data), nil
+}
+
+func WriteFile(filePath string, content []byte) error {
+ fh, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE, os.ModePerm)
+ if err != nil {
+ return err
+ }
+ defer fh.Close()
+
+ _, err = fh.Write(content)
+ if err != nil {
+ return err
+ }
+
+ return nil
+}