aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-03-25 22:58:52 +0800
committerzelig <viktor.tron@gmail.com>2015-03-27 03:00:18 +0800
commit4ec38e39320ee9abccd96da765a9c65fccd04151 (patch)
tree3f57aebae8bd42f766b80a3db5e3b22328e9a181 /common
parent23e41a57ad7e7cb4bc5a1cbad28bbf8d65907fdd (diff)
downloaddexon-4ec38e39320ee9abccd96da765a9c65fccd04151.tar
dexon-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.gz
dexon-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.bz2
dexon-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.lz
dexon-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.xz
dexon-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.zst
dexon-4ec38e39320ee9abccd96da765a9c65fccd04151.zip
common: remove WriteFile and ReadAllFile (use ioutil instead)
Diffstat (limited to 'common')
-rw-r--r--common/path.go30
-rw-r--r--common/path_test.go47
2 files changed, 1 insertions, 76 deletions
diff --git a/common/path.go b/common/path.go
index d38b1fd5b..a74a0d5bd 100644
--- a/common/path.go
+++ b/common/path.go
@@ -2,7 +2,6 @@ package common
import (
"fmt"
- "io/ioutil"
"os"
"os/user"
"path"
@@ -43,35 +42,6 @@ func FileExist(filePath string) bool {
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_TRUNC|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
-}
-
func AbsolutePath(Datadir string, filename string) string {
if path.IsAbs(filename) {
return filename
diff --git a/common/path_test.go b/common/path_test.go
index c831d1a57..4b90c543b 100644
--- a/common/path_test.go
+++ b/common/path_test.go
@@ -2,56 +2,11 @@ package common
import (
"os"
- "testing"
+ // "testing"
checker "gopkg.in/check.v1"
)
-func TestGoodFile(t *testing.T) {
- goodpath := "~/goethereumtest.pass"
- path := ExpandHomePath(goodpath)
- contentstring := "3.14159265358979323846"
-
- err := WriteFile(path, []byte(contentstring))
- if err != nil {
- t.Error("Could not write file")
- }
-
- if !FileExist(path) {
- t.Error("File not found at", path)
- }
-
- v, err := ReadAllFile(path)
- if err != nil {
- t.Error("Could not read file", path)
- }
- if v != contentstring {
- t.Error("Expected", contentstring, "Got", v)
- }
-
-}
-
-func TestBadFile(t *testing.T) {
- badpath := "/this/path/should/not/exist/goethereumtest.fail"
- path := ExpandHomePath(badpath)
- contentstring := "3.14159265358979323846"
-
- err := WriteFile(path, []byte(contentstring))
- if err == nil {
- t.Error("Wrote file, but should not be able to", path)
- }
-
- if FileExist(path) {
- t.Error("Found file, but should not be able to", path)
- }
-
- v, err := ReadAllFile(path)
- if err == nil {
- t.Error("Read file, but should not be able to", v)
- }
-
-}
-
type CommonSuite struct{}
var _ = checker.Suite(&CommonSuite{})