Correct GetWorkCmd.

The getwork RPC now only accepts a single optional parameter which, if
present, is a string containing the hex-encoded block data to solve.

Also update the tests for the new correct parameters.

ok @jcvernaleo

jsoncmd.go

@@ -3654,20 +3654,11 @@ func (cmd *GetTxOutSetInfoCmd) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// WorkRequest is a request object as defined in
-// https://en.bitcoin.it/wiki/Getwork, it is provided as a
-// pointer argument to GetWorkCmd.
-type WorkRequest struct {
-	Data      string `json:"data"`
-	Target    string `json:"target"`
-	Algorithm string `json:"algorithm,omitempty"`
-}
-
 // GetWorkCmd is a type handling custom marshaling and
 // unmarshaling of getwork JSON RPC commands.
 type GetWorkCmd struct {
-	id      interface{}
+	id   interface{}
-	Request *WorkRequest
+	Data string `json:"data,omitempty"`
 }
 
 // Enforce that GetWorkCmd satisifies the Cmd interface.
@@ -3675,17 +3666,17 @@ var _ Cmd = &GetWorkCmd{}
 
 // NewGetWorkCmd creates a new GetWorkCmd. Optionally a
 // pointer to a TemplateRequest may be provided.
-func NewGetWorkCmd(id interface{}, optArgs ...*WorkRequest) (*GetWorkCmd, error) {
+func NewGetWorkCmd(id interface{}, optArgs ...string) (*GetWorkCmd, error) {
-	var request *WorkRequest
+	var data string
 	if len(optArgs) > 0 {
 		if len(optArgs) > 1 {
 			return nil, ErrTooManyOptArgs
 		}
-		request = optArgs[0]
+		data = optArgs[0]
 	}
 	return &GetWorkCmd{
-		id:      id,
+		id:   id,
-		Request: request,
+		Data: data,
 	}, nil
 }
 
@@ -3712,8 +3703,8 @@ func (cmd *GetWorkCmd) MarshalJSON() ([]byte, error) {
 		Id:      cmd.id,
 		Params:  []interface{}{},
 	}
-	if cmd.Request != nil {
+	if cmd.Data != "" {
-		raw.Params = append(raw.Params, cmd.Request)
+		raw.Params = append(raw.Params, cmd.Data)
 	}
 
 	return json.Marshal(raw)
@@ -3730,46 +3721,15 @@ func (cmd *GetWorkCmd) UnmarshalJSON(b []byte) error {
 	if len(r.Params) > 1 {
 		return ErrWrongNumberOfParams
 	}
-	wrequest := new(WorkRequest)
+	var data string
 	if len(r.Params) == 1 {
-		rmap, ok := r.Params[0].(map[string]interface{})
+		sdata, ok := r.Params[0].(string)
 		if !ok {
-			return errors.New("first optional parameter template request must be an object")
+			return errors.New("data must be a string")
-		}
-
-		// data is required
-		data, ok := rmap["data"]
-		if !ok {
-			return errors.New("WorkRequest data must be present")
-		}
-		sdata, ok := data.(string)
-		if !ok {
-			return errors.New("WorkRequest data must be a string")
-		}
-		wrequest.Data = sdata
-
-		// target is required
-		target, ok := rmap["target"]
-		if !ok {
-			return errors.New("WorkRequest target must be present")
-		}
-		starget, ok := target.(string)
-		if !ok {
-			return errors.New("WorkRequest target must be a string")
-		}
-		wrequest.Target = starget
-
-		// algorithm is optional
-		algo, ok := rmap["algorithm"]
-		if ok {
-			salgo, ok := algo.(string)
-			if !ok {
-				return errors.New("WorkRequest algorithm must be a string")
-			}
-			wrequest.Algorithm = salgo
 		}
+		data = sdata
 	}
-	newCmd, err := NewGetWorkCmd(r.Id, wrequest)
+	newCmd, err := NewGetWorkCmd(r.Id, data)
 	if err != nil {
 		return err
 	}

jsoncmd_test.go

@@ -735,20 +735,11 @@ var jsoncmdtests = []struct {
 		name: "basic",
 		cmd:  "getwork",
 		f: func() (Cmd, error) {
-			return NewGetWorkCmd(testId,
+			return NewGetWorkCmd(testId, "some data")
-				&WorkRequest{
-					Data:      "some data",
-					Target:    "our target",
-					Algorithm: "algo",
-				})
 		},
 		result: &GetWorkCmd{
-			id: testId,
+			id:   testId,
-			Request: &WorkRequest{
+			Data: "some data",
-				Data:      "some data",
-				Target:    "our target",
-				Algorithm: "algo",
-			},
 		},
 	},
 	{