TMP: fix up post-cherry-pick

Author: rvagg

message/ipldbind/message.go

@@ -47,7 +47,7 @@ type GraphSyncExtensions struct {
 // GraphSyncRequest is a struct to capture data on a request contained in a
 // GraphSyncMessage.
 type GraphSyncRequest struct {
-	Id graphsync.RequestID
+	Id []byte
 
 	Root       cid.Cid
 	Selector   ipld.Node
@@ -65,7 +65,7 @@ type GraphSyncMetadatum struct {
 // GraphSyncResponse is an struct to capture data on a response sent back
 // in a GraphSyncMessage.
 type GraphSyncResponse struct {
-	Id graphsync.RequestID
+	Id []byte
 
 	Status     graphsync.ResponseStatusCode
 	Metadata   []GraphSyncMetadatum

message/message.go

@@ -218,7 +218,7 @@ func (gsm GraphSyncMessage) ToIPLD() (*ipldbind.GraphSyncMessage, error) {
 	ibm.Requests = make([]ipldbind.GraphSyncRequest, 0, len(gsm.requests))
 	for _, request := range gsm.requests {
 		ibm.Requests = append(ibm.Requests, ipldbind.GraphSyncRequest{
-			Id:       request.id,
+			Id:       request.id.Bytes(),
 			Root:     request.root,
 			Selector: request.selector,
 			Priority: request.priority,
@@ -231,7 +231,7 @@ func (gsm GraphSyncMessage) ToIPLD() (*ipldbind.GraphSyncMessage, error) {
 	ibm.Responses = make([]ipldbind.GraphSyncResponse, 0, len(gsm.responses))
 	for _, response := range gsm.responses {
 		ibm.Responses = append(ibm.Responses, ipldbind.GraphSyncResponse{
-			Id:     response.requestID,
+			Id:     response.requestID.Bytes(),
 			Status: response.status,
 			// Extensions: response.extensions,
 		})
@@ -252,13 +252,21 @@ func messageFromIPLD(ibm *ipldbind.GraphSyncMessage) (GraphSyncMessage, error) {
 	requests := make(map[graphsync.RequestID]GraphSyncRequest, len(ibm.Requests))
 	for _, req := range ibm.Requests {
 		// exts := req.Extensions
-		requests[graphsync.RequestID(req.Id)] = newRequest(graphsync.RequestID(req.Id), req.Root, req.Selector, graphsync.Priority(req.Priority), req.Cancel, req.Update, nil)
+		id, err := graphsync.ParseRequestID(req.Id)
+		if err != nil {
+			return GraphSyncMessage{}, err
+		}
+		requests[id] = newRequest(id, req.Root, req.Selector, graphsync.Priority(req.Priority), req.Cancel, req.Update, nil)
 	}
 
 	responses := make(map[graphsync.RequestID]GraphSyncResponse, len(ibm.Responses))
 	for _, res := range ibm.Responses {
 		// exts := res.Extensions
-		responses[graphsync.RequestID(res.Id)] = newResponse(graphsync.RequestID(res.Id), graphsync.ResponseStatusCode(res.Status), nil)
+		id, err := graphsync.ParseRequestID(res.Id)
+		if err != nil {
+			return GraphSyncMessage{}, err
+		}
+		responses[id] = newResponse(id, graphsync.ResponseStatusCode(res.Status), nil)
 	}
 
 	blks := make(map[cid.Cid]blocks.Block, len(ibm.Blocks))