From cfe037028081ebb84ee35caa5b16fed5d125b58a Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Sun, 1 Mar 2015 16:19:06 +0100
Subject: Remove Websockets RPC transport

---
 eth/backend.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'eth')

diff --git a/eth/backend.go b/eth/backend.go
index f67f9c78b..3490fb386 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -127,7 +127,6 @@ type Ethereum struct {
 	miner    *miner.Miner
 
 	RpcServer  rpc.RpcServer
-	WsServer   rpc.RpcServer
 	keyManager *crypto.KeyManager
 
 	logger ethlogger.LogSystem
@@ -285,9 +284,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()
-- 
cgit v1.2.3


From 7e224b683457884c3837967c34744c0a0996abd5 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Tue, 3 Mar 2015 13:22:19 +0700
Subject: db name database -> blockchain in backend error message

---
 eth/backend.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'eth')

diff --git a/eth/backend.go b/eth/backend.go
index f67f9c78b..b79f6fc30 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -147,7 +147,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)
 	}
 
-- 
cgit v1.2.3