fix err msg (#1361)

* fix err msg * calc root hash once
0chain · Jan 9, 2024 · 8125003 · 8125003
1 parent 553416a
commit 8125003
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 9 deletions.
diff --git a/zboxcore/allocationchange/copyobject.go b/zboxcore/allocationchange/copyobject.go
@@ -76,7 +76,6 @@ func (ch *CopyFileChange) ProcessChange(rootRef *fileref.Ref, fileIDMeta map[str
 	ch.processChildren(affectedRef, fileIDMeta)
 	dirRef.AddChild(ch.ObjectTree)
 
-	rootRef.CalculateHash()
 	return
 }
 

diff --git a/zboxcore/allocationchange/createdir.go b/zboxcore/allocationchange/createdir.go
@@ -60,7 +60,6 @@ func (d *DirCreateChange) ProcessChange(rootRef *fileref.Ref, FileIDMeta map[str
 		}
 	}
 
-	rootRef.CalculateHash()
 	return
 }
 

diff --git a/zboxcore/allocationchange/deletefile.go b/zboxcore/allocationchange/deletefile.go
@@ -17,7 +17,6 @@ func (ch *DeleteFileChange) ProcessChange(rootRef *fileref.Ref, _ map[string]str
 
 	if ch.ObjectTree.GetPath() == "/" {
 		rootRef.Children = nil
-		rootRef.CalculateHash()
 		return
 	}
 
@@ -48,7 +47,6 @@ func (ch *DeleteFileChange) ProcessChange(rootRef *fileref.Ref, _ map[string]str
 	for i, child := range dirRef.Children {
 		if child.GetName() == ch.ObjectTree.GetName() {
 			dirRef.RemoveChild(i)
-			rootRef.CalculateHash()
 			return
 		}
 	}

diff --git a/zboxcore/allocationchange/moveobject.go b/zboxcore/allocationchange/moveobject.go
@@ -112,7 +112,6 @@ func (ch *MoveFileChange) ProcessChange(rootRef *fileref.Ref, fileIDMeta map[str
 
 	dirRef.AddChild(ch.ObjectTree)
 
-	rootRef.CalculateHash()
 	return
 }
 

diff --git a/zboxcore/allocationchange/newfile.go b/zboxcore/allocationchange/newfile.go
@@ -92,7 +92,6 @@ func (ch *NewFileChange) ProcessChange(rootRef *fileref.Ref, fileIDMeta map[stri
 	fileIDMeta[ch.File.GetPath()] = ch.File.FileID
 
 	dirRef.AddChild(ch.File)
-	rootRef.CalculateHash()
 	return
 }
 

diff --git a/zboxcore/allocationchange/renameobject.go b/zboxcore/allocationchange/renameobject.go
@@ -64,7 +64,6 @@ func (ch *RenameFileChange) ProcessChange(rootRef *fileref.Ref, _ map[string]str
 		return
 	}
 	ch.processChildren(affectedRef)
-	rootRef.CalculateHash()
 	return
 }
 

diff --git a/zboxcore/allocationchange/updatefile.go b/zboxcore/allocationchange/updatefile.go
@@ -86,7 +86,6 @@ func (ch *UpdateFileChange) ProcessChange(rootRef *fileref.Ref, _ map[string]str
 	ch.NewFile.HashToBeComputed = true
 	ch.NewFile.FileID = ch.OldFile.FileID
 	dirRef.Children[idx] = ch.NewFile
-	rootRef.CalculateHash()
 	return
 }
 

diff --git a/zboxcore/sdk/commitworker.go b/zboxcore/sdk/commitworker.go
@@ -181,6 +181,7 @@ func (commitreq *CommitRequest) processCommit() {
 		}
 		size += change.GetSize()
 	}
+	rootRef.CalculateHash()
 	err = commitreq.commitBlobber(rootRef, lR.LatestWM, size, fileIDMeta)
 	if err != nil {
 		commitreq.result = ErrorCommitResult(err.Error())

diff --git a/zboxcore/sdk/downloadworker.go b/zboxcore/sdk/downloadworker.go
@@ -285,7 +285,7 @@ func (req *DownloadRequest) fillShards(shards [][][]byte, result *downloadBlock)
 			data = result.BlockChunks[i]
 		}
 		if i >= len(shards) || len(shards[i]) <= result.idx {
-			l.Logger.Error("Invalid shard index", result.idx, len(shards), len(shards[i]))
+			l.Logger.Error("Invalid shard index", result.idx, len(shards))
 			return errors.New("invalid_shard_index", fmt.Sprintf("Invalid shard index %d shard len: %d shard block len: %d", result.idx, len(shards), i))
 		}
 		shards[i][result.idx] = data