From f66432fe0b0dc41a39f451b5dcd7802e7eb70295 Mon Sep 17 00:00:00 2001
From: Alexandre Van de Sande <alex.vandesande@ethdev.com>
Date: Tue, 10 Feb 2015 15:27:21 +0100
Subject: [PATCH] merge conflicts

---
 rpc/http/server.go | 16 +++++++---------
 whisper/message.go |  5 +----
 xeth/whisper.go    | 11 -----------
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/rpc/http/server.go b/rpc/http/server.go
index 4e8c2ff9a5..a34400a77c 100644
--- a/rpc/http/server.go
+++ b/rpc/http/server.go
@@ -84,32 +84,30 @@ func (s *RpcHttpServer) Start() {
 }
 
 func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler {
+	var jsonrpcver string = "2.0"
 	fn := func(w http.ResponseWriter, req *http.Request) {
 		w.Header().Set("Access-Control-Allow-Origin", "*")
 
-		rpchttplogger.Debugln("Handling request")
+		rpchttplogger.DebugDetailln("Handling request")
 
 		reqParsed, reqerr := JSON.ParseRequestBody(req)
 		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
 		}
 
 		var response interface{}
 		reserr := api.GetRequestReply(&reqParsed, &response)
 		if reserr != nil {
-			rpchttplogger.Errorln(reserr)
-			JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: true, ErrorText: reserr.Error()})
+			rpchttplogger.Warnln(reserr)
+			jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()}
+			JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: &reqParsed.ID, Error: jsonerr})
 			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)
 		JSON.Send(w, &rpc.RpcSuccessResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Result: response})
->>>>>>> develop
 	}
 
 	return http.HandlerFunc(fn)
diff --git a/whisper/message.go b/whisper/message.go
index 050b8ca588..5d9e5b5c13 100644
--- a/whisper/message.go
+++ b/whisper/message.go
@@ -11,16 +11,13 @@ type Message struct {
 	Flags     byte
 	Signature []byte
 	Payload   []byte
-<<<<<<< HEAD
-=======
 	Sent      int64
 
 	To *ecdsa.PublicKey
->>>>>>> develop
 }
 
 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 {
diff --git a/xeth/whisper.go b/xeth/whisper.go
index d3a7c6c03c..d9c7e16140 100644
--- a/xeth/whisper.go
+++ b/xeth/whisper.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/whisper"
 )
@@ -99,28 +98,18 @@ type Options struct {
 
 type WhisperMessage struct {
 	ref     *whisper.Message
-	Flags   int32  `json:"flags"`
 	Payload string `json:"payload"`
 	To      string `json:"to"`
 	From    string `json:"from"`
-<<<<<<< HEAD
-=======
 	Sent    int64  `json:"sent"`
->>>>>>> develop
 }
 
 func NewWhisperMessage(msg *whisper.Message) WhisperMessage {
 	return WhisperMessage{
 		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),
 		From:    toHex(crypto.FromECDSAPub(msg.Recover())),
 		To:      toHex(crypto.FromECDSAPub(msg.To)),
 		Sent:    msg.Sent,
->>>>>>> develop
 	}
 }