merge

1 files changed, 0 insertions, 67 deletions

diff --git a/rpc/server.go b/rpc/server.go
deleted file mode 100644
index 983dc6c33..000000000
--- a/rpc/server.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package rpc
-
-import (
-	"fmt"
-	"net"
-	"net/rpc"
-	"net/rpc/jsonrpc"
-
-	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/xeth"
-)
-
-var jsonlogger = logger.NewLogger("JSON")
-
-type JsonRpcServer struct {
-	quit     chan bool
-	listener net.Listener
-	pipe     *xeth.JSXEth
-}
-
-func (s *JsonRpcServer) exitHandler() {
-out:
-	for {
-		select {
-		case <-s.quit:
-			s.listener.Close()
-			break out
-		}
-	}
-
-	jsonlogger.Infoln("Shutdown JSON-RPC server")
-}
-
-func (s *JsonRpcServer) Stop() {
-	close(s.quit)
-}
-
-func (s *JsonRpcServer) Start() {
-	jsonlogger.Infoln("Starting JSON-RPC server")
-	go s.exitHandler()
-	rpc.Register(&EthereumApi{pipe: s.pipe})
-	rpc.HandleHTTP()
-
-	for {
-		conn, err := s.listener.Accept()
-		if err != nil {
-			jsonlogger.Infoln("Error starting JSON-RPC:", err)
-			break
-		}
-		jsonlogger.Debugln("Incoming request.")
-		go jsonrpc.ServeConn(conn)
-	}
-}
-
-func NewJsonRpcServer(pipe *xeth.JSXEth, port int) (*JsonRpcServer, error) {
-	sport := fmt.Sprintf(":%d", port)
-	l, err := net.Listen("tcp", sport)
-	if err != nil {
-		return nil, err
-	}
-
-	return &JsonRpcServer{
-		listener: l,
-		quit:     make(chan bool),
-		pipe:     pipe,
-	}, nil
-}