diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-16 07:14:27 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-16 07:28:24 +0800 |
| commit | 3a51c3b584b16b408c3fbf87c4f9719fcfb1c52a (patch) | |
| tree | b2d4a5e7fcc1da2fd5b1aa3c139ddc7594c8646c /rpc | |
| parent | 97d2954e227049a089652d91e6fb0ea1c8115cc6 (diff) | |
| parent | c4678ffd77a18a9d03c888fdf242c9e5915b9f5f (diff) | |
| download | go-tangerine-3a51c3b584b16b408c3fbf87c4f9719fcfb1c52a.tar go-tangerine-3a51c3b584b16b408c3fbf87c4f9719fcfb1c52a.tar.gz go-tangerine-3a51c3b584b16b408c3fbf87c4f9719fcfb1c52a.tar.bz2 go-tangerine-3a51c3b584b16b408c3fbf87c4f9719fcfb1c52a.tar.lz go-tangerine-3a51c3b584b16b408c3fbf87c4f9719fcfb1c52a.tar.xz go-tangerine-3a51c3b584b16b408c3fbf87c4f9719fcfb1c52a.tar.zst go-tangerine-3a51c3b584b16b408c3fbf87c4f9719fcfb1c52a.zip | |
Merge branch 'develop' into downloader-proto
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/api.go | 2 | ||||
| -rw-r--r-- | rpc/http.go | 5 | ||||
| -rw-r--r-- | rpc/responses.go | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/rpc/api.go b/rpc/api.go index 58a9faa5d..4b61fa3a5 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -56,7 +56,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err *reply = api.xeth().IsListening() case "net_peerCount": *reply = newHexNum(api.xeth().PeerCount()) - case "eth_protocolVersion": + case "eth_version": *reply = api.xeth().EthVersion() case "eth_coinbase": *reply = newHexData(api.xeth().Coinbase()) diff --git a/rpc/http.go b/rpc/http.go index f15d557ad..790442a28 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -9,6 +9,7 @@ import ( "net/http" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/xeth" "github.com/rs/cors" ) @@ -110,7 +111,7 @@ func RpcResponse(api *EthereumApi, request *RpcRequest) *interface{} { response = &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: request.Id, Error: jsonerr} } - rpclogger.DebugDetailf("Generated response: %T %s", response, response) + glog.V(logger.Detail).Infof("Generated response: %T %s", response, response) return &response } @@ -121,7 +122,7 @@ func send(writer io.Writer, v interface{}) (n int, err error) { rpclogger.Fatalln("Error marshalling JSON", err) return 0, err } - rpclogger.DebugDetailf("Sending payload: %s", payload) + glog.V(logger.Detail).Infof("Sending payload: %s", payload) return writer.Write(payload) } diff --git a/rpc/responses.go b/rpc/responses.go index 3620f643e..5d1be8f34 100644 --- a/rpc/responses.go +++ b/rpc/responses.go @@ -277,7 +277,6 @@ type LogRes struct { Topics []*hexdata `json:"topics"` Data *hexdata `json:"data"` BlockNumber *hexnum `json:"blockNumber"` - Hash *hexdata `json:"hash"` LogIndex *hexnum `json:"logIndex"` BlockHash *hexdata `json:"blockHash"` TransactionHash *hexdata `json:"transactionHash"` |