diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-19 19:33:39 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-19 19:33:39 +0800 |
| commit | 4683f9c0a71fd42e749da46ac56c6ba76f379931 (patch) | |
| tree | 5f4610174d45e653835d7e223b793f8d20b15d67 /eth | |
| parent | cce4158cfc6c1080a2215dbbc5e52dfa3d310d61 (diff) | |
| parent | 9ec56637f9b19ab6213e74ec30c00033f1906888 (diff) | |
| download | go-tangerine-4683f9c0a71fd42e749da46ac56c6ba76f379931.tar go-tangerine-4683f9c0a71fd42e749da46ac56c6ba76f379931.tar.gz go-tangerine-4683f9c0a71fd42e749da46ac56c6ba76f379931.tar.bz2 go-tangerine-4683f9c0a71fd42e749da46ac56c6ba76f379931.tar.lz go-tangerine-4683f9c0a71fd42e749da46ac56c6ba76f379931.tar.xz go-tangerine-4683f9c0a71fd42e749da46ac56c6ba76f379931.tar.zst go-tangerine-4683f9c0a71fd42e749da46ac56c6ba76f379931.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/eth/backend.go b/eth/backend.go index 7799326fe..264753aba 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -3,7 +3,6 @@ package eth import ( "crypto/ecdsa" "fmt" - "io/ioutil" "math" "path" "strings" @@ -110,7 +109,7 @@ func (cfg *Config) nodeKey() (*ecdsa.PrivateKey, error) { if key, err = crypto.GenerateKey(); err != nil { return nil, fmt.Errorf("could not generate server key: %v", err) } - if err := ioutil.WriteFile(keyfile, crypto.FromECDSA(key), 0600); err != nil { + if err := crypto.SaveECDSA(keyfile, key); err != nil { glog.V(logger.Error).Infoln("could not persist nodekey: ", err) } return key, nil @@ -223,12 +222,10 @@ func New(config *Config) (*Ethereum, error) { if err != nil { return nil, err } - protocols := []p2p.Protocol{eth.protocolManager.SubProtocol} if config.Shh { protocols = append(protocols, eth.whisper.Protocol()) } - eth.net = &p2p.Server{ PrivateKey: netprv, Name: config.Name, |