rpc: migrated the RPC insterface to a new reflection based RPC layer

3 files changed, 0 insertions, 371 deletions

diff --git a/rpc/codec/codec.go b/rpc/codec/codec.go
deleted file mode 100644
index 786080b44..000000000
--- a/rpc/codec/codec.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package codec
-
-import (
-	"net"
-	"strconv"
-
-	"github.com/ethereum/go-ethereum/rpc/shared"
-)
-
-type Codec int
-
-// (de)serialization support for rpc interface
-type ApiCoder interface {
-	// Parse message to request from underlying stream
-	ReadRequest() ([]*shared.Request, bool, error)
-	// Parse response message from underlying stream
-	ReadResponse() (interface{}, error)
-	// Read raw message from underlying stream
-	Recv() (interface{}, error)
-	// Encode response to encoded form in underlying stream
-	WriteResponse(interface{}) error
-	// Decode single message from data
-	Decode([]byte, interface{}) error
-	// Encode msg to encoded form
-	Encode(msg interface{}) ([]byte, error)
-	// close the underlying stream
-	Close()
-}
-
-// supported codecs
-const (
-	JSON Codec = iota
-	nCodecs
-)
-
-var (
-	// collection with supported coders
-	coders = make([]func(net.Conn) ApiCoder, nCodecs)
-)
-
-// create a new coder instance
-func (c Codec) New(conn net.Conn) ApiCoder {
-	switch c {
-	case JSON:
-		return NewJsonCoder(conn)
-	}
-
-	panic("codec: request for codec #" + strconv.Itoa(int(c)) + " is unavailable")
-}
diff --git a/rpc/codec/json.go b/rpc/codec/json.go
deleted file mode 100644
index cfc449143..000000000
--- a/rpc/codec/json.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package codec
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"time"
-	"strings"
-
-	"github.com/ethereum/go-ethereum/rpc/shared"
-)
-
-const (
-	READ_TIMEOUT      = 60 // in seconds
-	MAX_REQUEST_SIZE  = 1024 * 1024
-	MAX_RESPONSE_SIZE = 1024 * 1024
-)
-
-// Json serialization support
-type JsonCodec struct {
-	c net.Conn
-	d *json.Decoder
-}
-
-// Create new JSON coder instance
-func NewJsonCoder(conn net.Conn) ApiCoder {
-	return &JsonCodec{
-		c: conn,
-		d: json.NewDecoder(conn),
-	}
-}
-
-// Read incoming request and parse it to RPC request
-func (self *JsonCodec) ReadRequest() (requests []*shared.Request, isBatch bool, err error) {
-	deadline := time.Now().Add(READ_TIMEOUT * time.Second)
-	if err := self.c.SetDeadline(deadline); err != nil {
-		return nil, false, err
-	}
-
-	var incoming json.RawMessage
-	err = self.d.Decode(&incoming)
-	if err == nil {
-		isBatch = incoming[0] == '['
-		if isBatch {
-			requests = make([]*shared.Request, 0)
-			err = json.Unmarshal(incoming, &requests)
-		} else {
-			requests = make([]*shared.Request, 1)
-			var singleRequest shared.Request
-			if err = json.Unmarshal(incoming, &singleRequest); err == nil {
-				requests[0] = &singleRequest
-			}
-		}
-		return
-	}
-
-	self.c.Close()
-	return nil, false, err
-}
-
-func (self *JsonCodec) Recv() (interface{}, error) {
-	var msg json.RawMessage
-	err := self.d.Decode(&msg)
-	if err != nil {
-		self.c.Close()
-		return nil, err
-	}
-
-	return msg, err
-}
-
-func (self *JsonCodec) ReadResponse() (interface{}, error) {
-	in, err := self.Recv()
-	if err != nil {
-		return nil, err
-	}
-
-	if msg, ok := in.(json.RawMessage); ok {
-		var req *shared.Request
-		if err = json.Unmarshal(msg, &req); err == nil && strings.HasPrefix(req.Method, "agent_") {
-			return req, nil
-		}
-
-		var failure *shared.ErrorResponse
-		if err = json.Unmarshal(msg, &failure); err == nil && failure.Error != nil {
-			return failure, fmt.Errorf(failure.Error.Message)
-		}
-
-		var success *shared.SuccessResponse
-		if err = json.Unmarshal(msg, &success); err == nil {
-			return success, nil
-		}
-	}
-
-	return in, err
-}
-
-// Decode data
-func (self *JsonCodec) Decode(data []byte, msg interface{}) error {
-	return json.Unmarshal(data, msg)
-}
-
-// Encode message
-func (self *JsonCodec) Encode(msg interface{}) ([]byte, error) {
-	return json.Marshal(msg)
-}
-
-// Parse JSON data from conn to obj
-func (self *JsonCodec) WriteResponse(res interface{}) error {
-	data, err := json.Marshal(res)
-	if err != nil {
-		self.c.Close()
-		return err
-	}
-
-	bytesWritten := 0
-
-	for bytesWritten < len(data) {
-		n, err := self.c.Write(data[bytesWritten:])
-		if err != nil {
-			self.c.Close()
-			return err
-		}
-		bytesWritten += n
-	}
-
-	return nil
-}
-
-// Close decoder and encoder
-func (self *JsonCodec) Close() {
-	self.c.Close()
-}
diff --git a/rpc/codec/json_test.go b/rpc/codec/json_test.go
deleted file mode 100644
index 01ef77e57..000000000
--- a/rpc/codec/json_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package codec
-
-import (
-	"bytes"
-	"io"
-	"net"
-	"testing"
-	"time"
-)
-
-type jsonTestConn struct {
-	buffer *bytes.Buffer
-}
-
-func newJsonTestConn(data []byte) *jsonTestConn {
-	return &jsonTestConn{
-		buffer: bytes.NewBuffer(data),
-	}
-}
-
-func (self *jsonTestConn) Read(p []byte) (n int, err error) {
-	return self.buffer.Read(p)
-}
-
-func (self *jsonTestConn) Write(p []byte) (n int, err error) {
-	return self.buffer.Write(p)
-}
-
-func (self *jsonTestConn) Close() error {
-	// not implemented
-	return nil
-}
-
-func (self *jsonTestConn) LocalAddr() net.Addr {
-	// not implemented
-	return nil
-}
-
-func (self *jsonTestConn) RemoteAddr() net.Addr {
-	// not implemented
-	return nil
-}
-
-func (self *jsonTestConn) SetDeadline(t time.Time) error {
-	return nil
-}
-
-func (self *jsonTestConn) SetReadDeadline(t time.Time) error {
-	return nil
-}
-
-func (self *jsonTestConn) SetWriteDeadline(t time.Time) error {
-	return nil
-}
-
-func TestJsonDecoderWithValidRequest(t *testing.T) {
-	reqdata := []byte(`{"jsonrpc":"2.0","method":"modules","params":[],"id":64}`)
-	decoder := newJsonTestConn(reqdata)
-
-	jsonDecoder := NewJsonCoder(decoder)
-	requests, batch, err := jsonDecoder.ReadRequest()
-
-	if err != nil {
-		t.Errorf("Read valid request failed - %v", err)
-	}
-
-	if len(requests) != 1 {
-		t.Errorf("Expected to get a single request but got %d", len(requests))
-	}
-
-	if batch {
-		t.Errorf("Got batch indication while expecting single request")
-	}
-
-	if requests[0].Id != float64(64) {
-		t.Errorf("Expected req.Id == 64 but got %v", requests[0].Id)
-	}
-
-	if requests[0].Method != "modules" {
-		t.Errorf("Expected req.Method == 'modules' got '%s'", requests[0].Method)
-	}
-}
-
-func TestJsonDecoderWithValidBatchRequest(t *testing.T) {
-	reqdata := []byte(`[{"jsonrpc":"2.0","method":"modules","params":[],"id":64},
-		{"jsonrpc":"2.0","method":"modules","params":[],"id":64}]`)
-	decoder := newJsonTestConn(reqdata)
-
-	jsonDecoder := NewJsonCoder(decoder)
-	requests, batch, err := jsonDecoder.ReadRequest()
-
-	if err != nil {
-		t.Errorf("Read valid batch request failed - %v", err)
-	}
-
-	if len(requests) != 2 {
-		t.Errorf("Expected to get two requests but got %d", len(requests))
-	}
-
-	if !batch {
-		t.Errorf("Got no batch indication while expecting batch request")
-	}
-
-	for i := 0; i < len(requests); i++ {
-		if requests[i].Id != float64(64) {
-			t.Errorf("Expected req.Id == 64 but got %v", requests[i].Id)
-		}
-
-		if requests[i].Method != "modules" {
-			t.Errorf("Expected req.Method == 'modules' got '%s'", requests[i].Method)
-		}
-	}
-}
-
-func TestJsonDecoderWithInvalidIncompleteMessage(t *testing.T) {
-	reqdata := []byte(`{"jsonrpc":"2.0","method":"modules","pa`)
-	decoder := newJsonTestConn(reqdata)
-
-	jsonDecoder := NewJsonCoder(decoder)
-	requests, batch, err := jsonDecoder.ReadRequest()
-
-	if err != io.ErrUnexpectedEOF {
-		t.Errorf("Expected to read an incomplete request err but got %v", err)
-	}
-
-	// remaining message
-	decoder.Write([]byte(`rams":[],"id:64"}`))
-	requests, batch, err = jsonDecoder.ReadRequest()
-
-	if err == nil {
-		t.Errorf("Expected an error but got nil")
-	}
-
-	if len(requests) != 0 {
-		t.Errorf("Expected to get no requests but got %d", len(requests))
-	}
-
-	if batch {
-		t.Errorf("Got batch indication while expecting non batch")
-	}
-}