diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-04 03:34:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-04 03:34:48 +0800 |
| commit | bb152612e0466164d33ff7f2023d804d7db18c01 (patch) | |
| tree | e4210c42c574e986fd886c753258b7d063597095 /eth/backend.go | |
| parent | cfe3af099c7fb4b637132a5c0ab2b94569418084 (diff) | |
| parent | 253eb778d19af9204c9dd65e3963bd63f3bab6f0 (diff) | |
| download | dexon-bb152612e0466164d33ff7f2023d804d7db18c01.tar.gz dexon-bb152612e0466164d33ff7f2023d804d7db18c01.tar.zst dexon-bb152612e0466164d33ff7f2023d804d7db18c01.zip | |
Merge branch 'develop' into poc-9
Conflicts:
cmd/utils/cmd.go
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/eth/backend.go b/eth/backend.go index 8673a265a..5cd7b308f 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -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() |