Merge pull request #1601 from 0chain/hotfix/fix-merge

dabasov · web-flow · commit 71d5f2b9dd5a · 2024-09-04T14:45:01.000+03:00
fix merged changes
diff --git a/zboxcore/sdk/downloadworker.go b/zboxcore/sdk/downloadworker.go
@@ -607,12 +607,6 @@ func (req *DownloadRequest) processDownload() {
 								hashWg.Done()
 							}()
 						}
-					} else {
-						hashWg.Add(1)
-						go func() {
-							writeData(actualFileHasher, data, req.datashards, int(remainingSize)) //nolint
-							hashWg.Done()
-						}()
 					}
 
 					totalWritten, err := writeData(req.fileHandler, data, req.datashards, int(remainingSize))
@@ -660,12 +654,6 @@ func (req *DownloadRequest) processDownload() {
 										hashWg.Done()
 									}()
 								}
-							} else {
-								hashWg.Add(1)
-								go func() {
-									writeData(actualFileHasher, block.data, req.datashards, int(remainingSize)) //nolint
-									hashWg.Done()
-								}()
 							}
 
 							totalWritten, err := writeData(req.fileHandler, block.data, req.datashards, int(remainingSize))

Original file line number	Diff line number	Diff line change
`@@ -607,12 +607,6 @@ func (req *DownloadRequest) processDownload() {`
`607`	`607`	`hashWg.Done()`
`608`	`608`	`}()`
`609`	`609`	`}`
`610`		`- } else {`
`611`		`- hashWg.Add(1)`
`612`		`- go func() {`
`613`		`- writeData(actualFileHasher, data, req.datashards, int(remainingSize)) //nolint`
`614`		`- hashWg.Done()`
`615`		`- }()`
`616`	`610`	`}`
`617`	`611`
`618`	`612`	`totalWritten, err := writeData(req.fileHandler, data, req.datashards, int(remainingSize))`
`@@ -660,12 +654,6 @@ func (req *DownloadRequest) processDownload() {`
`660`	`654`	`hashWg.Done()`
`661`	`655`	`}()`
`662`	`656`	`}`
`663`		`- } else {`
`664`		`- hashWg.Add(1)`
`665`		`- go func() {`
`666`		`- writeData(actualFileHasher, block.data, req.datashards, int(remainingSize)) //nolint`
`667`		`- hashWg.Done()`
`668`		`- }()`
`669`	`657`	`}`
`670`	`658`
`671`	`659`	`totalWritten, err := writeData(req.fileHandler, block.data, req.datashards, int(remainingSize))`