[GitHub] andrzej-kaczmarek closed pull request #93: nmxact: Make field name for uploaded data hash shorter

[GitBox <gi...@apache.org>]

andrzej-kaczmarek closed pull request #93: nmxact: Make field name for uploaded data hash shorter
URL: https://github.com/apache/mynewt-newtmgr/pull/93
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/nmxact/nmp/image.go b/nmxact/nmp/image.go
index 762d3ae7..4bc94362 100644
--- a/nmxact/nmp/image.go
+++ b/nmxact/nmp/image.go
@@ -29,7 +29,7 @@ type ImageUploadReq struct {
 	NmpBase         `codec:"-"`
 	Off      uint32 `codec:"off"`
 	Len      uint32 `codec:"len,omitempty"`
-	DataHash []byte `codec:"datahash,omitempty"`
+	DataSha  []byte `codec:"sha,omitempty"`
 	Data     []byte `codec:"data"`
 }
 
diff --git a/nmxact/xact/image.go b/nmxact/xact/image.go
index f8c2902c..f8791d88 100644
--- a/nmxact/xact/image.go
+++ b/nmxact/xact/image.go
@@ -73,7 +73,7 @@ func buildImageUploadReq(imageSz int, hash []byte, chunk []byte,
 
 	if off == 0 {
 		r.Len = uint32(imageSz)
-		r.DataHash = hash
+		r.DataSha = hash
 	}
 	r.Off = uint32(off)
 	r.Data = chunk


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services