forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 20:56:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

merge conflicts

Browse source
This commit is contained in:
Alexandre Van de Sande 2015-02-10 15:27:21 +01:00
parent d62c9b8314
commit f66432fe0b
3 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rpc/http/server.go
View file

@ -84,32 +84,30 @@ func (s *RpcHttpServer) Start() {
} }
func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler {
var jsonrpcver string = "2.0"
fn := func(w http.ResponseWriter, req *http.Request) { fn := func(w http.ResponseWriter, req *http.Request) {
w.Header().Set("Access-Control-Allow-Origin", "*") w.Header().Set("Access-Control-Allow-Origin", "*")
rpchttplogger.Debugln("Handling request") rpchttplogger.DebugDetailln("Handling request")
reqParsed, reqerr := JSON.ParseRequestBody(req) reqParsed, reqerr := JSON.ParseRequestBody(req)
if reqerr != nil { if reqerr != nil {
JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: true, ErrorText: rpc.ErrorParseRequest}) jsonerr := &rpc.RpcErrorObject{-32700, rpc.ErrorParseRequest}
JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
return return
} }
var response interface{} var response interface{}
reserr := api.GetRequestReply(&reqParsed, &response) reserr := api.GetRequestReply(&reqParsed, &response)
if reserr != nil { if reserr != nil {
rpchttplogger.Errorln(reserr) rpchttplogger.Warnln(reserr)
JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: true, ErrorText: reserr.Error()}) jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()}
JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: &reqParsed.ID, Error: jsonerr})
return return
} }
<<<<<<< HEAD
rpchttplogger.Debugf("Generated response: %T %s", response, response)
JSON.Send(w, &rpc.RpcSuccessResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: false, Result: response})
=======
rpchttplogger.DebugDetailf("Generated response: %T %s", response, response) rpchttplogger.DebugDetailf("Generated response: %T %s", response, response)
JSON.Send(w, &rpc.RpcSuccessResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Result: response}) JSON.Send(w, &rpc.RpcSuccessResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Result: response})
>>>>>>> develop
} }
return http.HandlerFunc(fn) return http.HandlerFunc(fn)

5
whisper/message.go
View file

@ -11,16 +11,13 @@ type Message struct {
Flags byte Flags byte
Signature []byte Signature []byte
Payload []byte Payload []byte
<<<<<<< HEAD
=======
Sent int64 Sent int64
To *ecdsa.PublicKey To *ecdsa.PublicKey
>>>>>>> develop
} }
func NewMessage(payload []byte) *Message { func NewMessage(payload []byte) *Message {
return &Message{Flags: 0, Payload: payload} return &Message{Flags: 0, Payload: payload, Sent: time.Now().Unix()}
} }
func (self *Message) hash() []byte { func (self *Message) hash() []byte {

11
xeth/whisper.go
View file

@ -5,7 +5,6 @@ import (
"time" "time"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/whisper" "github.com/ethereum/go-ethereum/whisper"
) )
@ -99,28 +98,18 @@ type Options struct {
type WhisperMessage struct { type WhisperMessage struct {
ref *whisper.Message ref *whisper.Message
Flags int32 `json:"flags"`
Payload string `json:"payload"` Payload string `json:"payload"`
To string `json:"to"` To string `json:"to"`
From string `json:"from"` From string `json:"from"`
<<<<<<< HEAD
=======
Sent int64 `json:"sent"` Sent int64 `json:"sent"`
>>>>>>> develop
} }
func NewWhisperMessage(msg *whisper.Message) WhisperMessage { func NewWhisperMessage(msg *whisper.Message) WhisperMessage {
return WhisperMessage{ return WhisperMessage{
ref: msg, ref: msg,
<<<<<<< HEAD
Flags: int32(msg.Flags),
Payload: "0x" + ethutil.Bytes2Hex(msg.Payload),
From: "0x" + ethutil.Bytes2Hex(crypto.FromECDSAPub(msg.Recover())),
=======
Payload: toHex(msg.Payload), Payload: toHex(msg.Payload),
From: toHex(crypto.FromECDSAPub(msg.Recover())), From: toHex(crypto.FromECDSAPub(msg.Recover())),
To: toHex(crypto.FromECDSAPub(msg.To)), To: toHex(crypto.FromECDSAPub(msg.To)),
Sent: msg.Sent, Sent: msg.Sent,
>>>>>>> develop
} }
} }