Merge pull request #306 from FactomProject/FD-167

Fd 167

wsapi/wsapiStructs.go

@@ -96,6 +96,16 @@ type EntryBlockResponse struct {
 	EntryList []EntryAddr `json:"entrylist"`
 }
 
+type EntryCreditBlockResponse struct {
+	ECBlock struct {
+		Header     interfaces.IECBlockHeader
+		Body       interfaces.IECBlockBody
+		HeaderHash interfaces.IHash `json:"headerhash"`
+		FullHash   interfaces.IHash `json:"fullhash"`
+	} `json:"ecblock"`
+	RawData string `json:"rawdata"`
+}
+
 type EntryResponse struct {
 	ChainID string   `json:"chainid"`
 	Content string   `json:"content"`

wsapi/wsapiV2.go

@@ -181,6 +181,7 @@ func HandleV2Request(state interfaces.IState, j *primitives.JSON2Request) (*prim
 	jsonResp := primitives.NewJSON2Response()
 	jsonResp.ID = j.ID
 	jsonResp.Result = resp
+
 	return jsonResp, nil
 }
 
@@ -247,7 +248,7 @@ func HandleV2EntryCreditBlock(state interfaces.IState, params interface{}) (inte
 		return nil, NewBlockNotFoundError()
 	}
 
-	return ecBlockToResp(block)
+	return ECBlockToResp(block)
 }
 
 func HandleV2ECBlockByHeight(state interfaces.IState, params interface{}) (interface{}, *primitives.JSONError) {
@@ -271,23 +272,33 @@ func HandleV2ECBlockByHeight(state interfaces.IState, params interface{}) (inter
 		return nil, NewBlockNotFoundError()
 	}
 
-	return ecBlockToResp(block)
+	return ECBlockToResp(block)
 }
 
-func ecBlockToResp(block interfaces.IEntryCreditBlock) (interface{}, *primitives.JSONError) {
+func ECBlockToResp(block interfaces.IEntryCreditBlock) (interface{}, *primitives.JSONError) {
 	raw, err := block.MarshalBinary()
 	if err != nil {
 		return nil, NewInternalError()
 	}
 
-	resp := new(BlockHeightResponse)
-	b, err := ObjectToJStruct(block)
+	resp := new(EntryCreditBlockResponse)
+
 	if err != nil {
 		return nil, NewInternalError()
 	}
-	resp.ECBlock = b
+	resp.ECBlock.Body = block.GetBody()
+	resp.ECBlock.Header = block.GetHeader()
 	resp.RawData = hex.EncodeToString(raw)
-
+	tmpHash, err := block.GetFullHash()
+	if err != nil {
+		return nil, NewInternalError()
+	}
+	resp.ECBlock.FullHash = tmpHash
+	tmpHash, err = block.HeaderHash()
+	if err != nil {
+		return nil, NewInternalError()
+	}
+	resp.ECBlock.HeaderHash = tmpHash
 	return resp, nil
 }
 

wsapi/wsapiV2_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"reflect"
 	"strings"
 	"testing"
 
@@ -442,3 +443,30 @@ func TestJSONString(t *testing.T) {
 		}
 	}
 }
+
+func Test_ecBlockToResp(t *testing.T) {
+	type args struct {
+		block interfaces.IEntryCreditBlock
+	}
+	tests := []struct {
+		name  string
+		args  args
+		want  interface{}
+		want1 *primitives.JSONError
+	}{
+
+	// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			got, got1 := ECBlockToResp(tt.args.block)
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("ecBlockToResp() got = %v, want %v", got, tt.want)
+			}
+			if !reflect.DeepEqual(got1, tt.want1) {
+				t.Errorf("ecBlockToResp() got1 = %v, want %v", got1, tt.want1)
+			}
+		})
+	}
+}