forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 18:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

whisper/mailserver: pass init error to the caller

Browse source
This commit is contained in:
Ivan Danyliuk 2018-05-03 20:12:50 +02:00
parent fd3da7c69d
commit af6c245103
No known key found for this signature in database
GPG key ID: 97ED33CE024E1DBF
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/wnode/main.go
View file

@ -271,7 +271,9 @@ func initialize() {
if *mailServerMode { if *mailServerMode {
shh.RegisterServer(&mailServer) shh.RegisterServer(&mailServer)
mailServer.Init(shh, *argDBPath, msPassword, *argServerPoW) if err := mailServer.Init(shh, *argDBPath, msPassword, *argServerPoW); err != nil {
utils.Fatalf("Failed to init MailServer: %s", err)
}
} }
server = &p2p.Server{ server = &p2p.Server{

14
whisper/mailserver/mailserver.go
View file

@ -20,7 +20,6 @@ import (
"encoding/binary" "encoding/binary"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
@ -54,19 +53,19 @@ func NewDbKey(t uint32, h common.Hash) *DBKey {
return &k return &k
} }
func (s *WMailServer) Init(shh *whisper.Whisper, path string, password string, pow float64) { func (s *WMailServer) Init(shh *whisper.Whisper, path string, password string, pow float64) error {
var err error var err error
if len(path) == 0 { if len(path) == 0 {
utils.Fatalf("DB file is not specified") return fmt.Errorf("DB file is not specified")
} }
if len(password) == 0 { if len(password) == 0 {
utils.Fatalf("Password is not specified for MailServer") fmt.Errorf("password is not specified")
} }
s.db, err = leveldb.OpenFile(path, nil) s.db, err = leveldb.OpenFile(path, nil)
if err != nil { if err != nil {
utils.Fatalf("Failed to open DB file: %s", err) fmt.Errorf("open DB file: %s", err)
} }
s.w = shh s.w = shh
@ -74,12 +73,13 @@ func (s *WMailServer) Init(shh *whisper.Whisper, path string, password string, p
MailServerKeyID, err := s.w.AddSymKeyFromPassword(password) MailServerKeyID, err := s.w.AddSymKeyFromPassword(password)
if err != nil { if err != nil {
utils.Fatalf("Failed to create symmetric key for MailServer: %s", err) fmt.Errorf("create symmetric key: %s", err)
} }
s.key, err = s.w.GetSymKey(MailServerKeyID) s.key, err = s.w.GetSymKey(MailServerKeyID)
if err != nil { if err != nil {
utils.Fatalf("Failed to save symmetric key for MailServer") fmt.Errorf("save symmetric key: %s", err)
} }
return nil
} }
func (s *WMailServer) Close() { func (s *WMailServer) Close() {