diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-25 22:58:52 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-27 03:00:18 +0800 |
| commit | 4ec38e39320ee9abccd96da765a9c65fccd04151 (patch) | |
| tree | 3f57aebae8bd42f766b80a3db5e3b22328e9a181 /cmd/ethereum | |
| parent | 23e41a57ad7e7cb4bc5a1cbad28bbf8d65907fdd (diff) | |
| download | go-tangerine-4ec38e39320ee9abccd96da765a9c65fccd04151.tar go-tangerine-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.gz go-tangerine-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.bz2 go-tangerine-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.lz go-tangerine-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.xz go-tangerine-4ec38e39320ee9abccd96da765a9c65fccd04151.tar.zst go-tangerine-4ec38e39320ee9abccd96da765a9c65fccd04151.zip | |
common: remove WriteFile and ReadAllFile (use ioutil instead)
Diffstat (limited to 'cmd/ethereum')
| -rw-r--r-- | cmd/ethereum/js_test.go | 6 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cmd/ethereum/js_test.go b/cmd/ethereum/js_test.go index 580bc7a2b..5b962f621 100644 --- a/cmd/ethereum/js_test.go +++ b/cmd/ethereum/js_test.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "io/ioutil" "os" "path" "testing" @@ -9,7 +10,6 @@ import ( "github.com/robertkrimen/otto" "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth" ) @@ -30,8 +30,8 @@ func testJEthRE(t *testing.T) (repl *jsre, ethereum *eth.Ethereum, err error) { } // FIXME: this does not work ATM ks := crypto.NewKeyStorePlain("/tmp/eth/keys") - common.WriteFile("/tmp/eth/keys/e273f01c99144c438695e10f24926dc1f9fbf62d/e273f01c99144c438695e10f24926dc1f9fbf62d", - []byte(`{"Id":"RhRXD+fNRKS4jx+7ZfEsNA==","Address":"4nPwHJkUTEOGleEPJJJtwfn79i0=","PrivateKey":"h4ACVpe74uIvi5Cg/2tX/Yrm2xdr3J7QoMbMtNX2CNc="}`)) + ioutil.WriteFile("/tmp/eth/keys/e273f01c99144c438695e10f24926dc1f9fbf62d/e273f01c99144c438695e10f24926dc1f9fbf62d", + []byte(`{"Id":"RhRXD+fNRKS4jx+7ZfEsNA==","Address":"4nPwHJkUTEOGleEPJJJtwfn79i0=","PrivateKey":"h4ACVpe74uIvi5Cg/2tX/Yrm2xdr3J7QoMbMtNX2CNc="}`), os.ModePerm) port++ ethereum, err = eth.New(ð.Config{ diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 57729b206..6bbe1044f 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -355,10 +355,11 @@ func getPassPhrase(ctx *cli.Context, desc string, confirmation bool) (passphrase passphrase = auth } else { - var err error - if passphrase, err = common.ReadAllFile(passfile); err != nil { + passbytes, err := ioutil.ReadFile(passfile) + if err != nil { utils.Fatalf("Unable to read password file '%s': %v", passfile, err) } + passphrase = string(passbytes) } } return |