gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into poc-9

Browse Source 
Conflicts:
	cmd/utils/cmd.go
This commit is contained in:
obscuren
2015-03-03 20:34:48 +01:00
parent cfe3af099c 253eb778d1
commit bb152612e0
9 changed files with 49 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eth/backend.go
View File

@ -129,7 +129,6 @@ type Ethereum struct {
miner *miner.Miner
RpcServer rpc.RpcServer
WsServer rpc.RpcServer
keyManager *crypto.KeyManager
logger logger.LogSystem
@ -149,7 +148,7 @@ func New(config *Config) (*Ethereum, error) {
d, _ := db.Get([]byte("ProtocolVersion"))
protov := ethutil.NewValue(d).Uint()
if protov != ProtocolVersion && protov != 0 {
path := path.Join(config.DataDir, "database")
path := path.Join(config.DataDir, "blockchain")
return nil, fmt.Errorf("Database version mismatch. Protocol(%d / %d). `rm -rf %s`", protov, ProtocolVersion, path)
}
@ -289,9 +288,7 @@ func (s *Ethereum) Stop() {
if s.RpcServer != nil {
s.RpcServer.Stop()
}
if s.WsServer != nil {
s.WsServer.Stop()
}
s.txPool.Stop()
s.eventMux.Stop()
s.blockPool.Stop()