new id and version marshalers

wire.go

@@ -131,45 +131,3 @@ func (id *ID) UnmarshalJSON(data []byte) error {
 	id.null = true
 	return nil
 }
-
-// wireRequest is sent to a server to represent a Call or Notify operaton.
-type wireRequest struct {
-	// VersionTag is always encoded as the string "2.0"
-	VersionTag version `json:"jsonrpc"`
-	// Method is a string containing the method name to invoke.
-	Method string `json:"method"`
-	// Params is either a struct or an array with the parameters of the method.
-	Params *json.RawMessage `json:"params,omitempty"`
-	// The id of this request, used to tie the Response back to the request.
-	// Will be either a string or a number. If not set, the Request is a notify,
-	// and no response is possible.
-	ID *ID `json:"id,omitempty"`
-}
-
-// wireResponse is a reply to a Request.
-//
-// It will always have the ID field set to tie it back to a request, and will
-// have either the Result or Error fields set depending on whether it is a
-// success or failure wireResponse.
-type wireResponse struct {
-	// VersionTag is always encoded as the string "2.0"
-	VersionTag version `json:"jsonrpc"`
-	// Result is the response value, and is required on success.
-	Result *json.RawMessage `json:"result,omitempty"`
-	// Error is a structured error response if the call fails.
-	Error *Error `json:"error,omitempty"`
-	// ID must be set and is the identifier of the Request this is a response to.
-	ID *ID `json:"id,omitempty"`
-}
-
-// combined has all the fields of both Request and Response.
-//
-// We can decode this and then work out which it is.
-type combined struct {
-	VersionTag version          `json:"jsonrpc"`
-	ID         *ID              `json:"id,omitempty"`
-	Method     string           `json:"method"`
-	Params     *json.RawMessage `json:"params,omitempty"`
-	Result     *json.RawMessage `json:"result,omitempty"`
-	Error      *Error           `json:"error,omitempty"`
-}