remove path header, fix ws tag (#1223)

* remove path header, fix ws tag * fixed broken build --------- Co-authored-by: din-mukhammed <[email protected]>
0chain · Sep 14, 2023 · f9dc5b1 · f9dc5b1
1 parent 6c6e208
commit f9dc5b1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/wasmsdk/blobber.go b/wasmsdk/blobber.go
@@ -472,10 +472,9 @@ type BulkUploadOption struct {
 
 	ThumbnailBytes jsbridge.Bytes `json:"thumbnailBytes,omitempty"`
 	Encrypt        bool           `json:"encrypt,omitempty"`
-	Webstreaming   bool           `json:"webstreaming,omitempty"`
+	IsWebstreaming bool           `json:"webstreaming,omitempty"`
 	IsUpdate       bool           `json:"isUpdate,omitempty"`
 	IsRepair       bool           `json:"isRepair,omitempty"`
-	IsWebstreaming bool           `json:"isWebstreaming,omitempty"`
 
 	NumBlocks         int    `json:"numBlocks,omitempty"`
 	FileSize          int64  `json:"fileSize,omitempty"`
@@ -569,7 +568,7 @@ func bulkUpload(jsonBulkUploadOptions string) ([]BulkUploadResult, error) {
 				o.ReadChunkFuncName,
 				o.FileSize,
 				o.ThumbnailBytes.Buffer,
-				o.Webstreaming,
+				o.IsWebstreaming,
 				o.Encrypt,
 				o.IsUpdate,
 				o.IsRepair,

diff --git a/zboxcore/sdk/blockdownloadworker.go b/zboxcore/sdk/blockdownloadworker.go
@@ -124,7 +124,6 @@ func (req *BlockDownloadRequest) downloadBlobberBlock() {
 		}
 
 		header := &DownloadRequestHeader{}
-		header.Path = req.remotefilepath
 		header.PathHash = req.remotefilepathhash
 		header.BlockNum = req.blockNum
 		header.NumBlocks = req.numBlocks

diff --git a/zboxcore/sdk/download_reqeust_header.go b/zboxcore/sdk/download_reqeust_header.go
@@ -10,7 +10,6 @@ import (
 type DownloadRequestHeader struct {
 	ClientID       string
 	PathHash       string
-	Path           string
 	BlockNum       int64
 	NumBlocks      int64
 	ReadMarker     []byte
@@ -22,10 +21,6 @@ type DownloadRequestHeader struct {
 
 // ToHeader update header
 func (h *DownloadRequestHeader) ToHeader(req *http.Request) {
-	if h.Path != "" {
-		req.Header.Set("X-Path", h.Path)
-	}
-
 	if h.PathHash != "" {
 		req.Header.Set("X-Path-Hash", h.PathHash)
 	}

diff --git a/zboxcore/sdk/downloadworker.go b/zboxcore/sdk/downloadworker.go
@@ -591,7 +591,6 @@ func (req *DownloadRequest) attemptSubmitReadMarker(blobber *blockchain.StorageN
 	}
 
 	header := &DownloadRequestHeader{
-		Path:         req.remotefilepath,
 		PathHash:     req.remotefilepathhash,
 		ReadMarker:   rmData,
 		ConnectionID: req.connectionID,