fix lint errors

erigontech · Feb 13, 2025 · 62e0fd0 · 62e0fd0
1 parent c66acd4
commit 62e0fd0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 34 deletions.
diff --git a/erigon-lib/commitment/hex_patricia_hashed.go b/erigon-lib/commitment/hex_patricia_hashed.go
@@ -2666,7 +2666,7 @@ func (p *ParallelPatriciaHashed) RootTrie() *HexPatriciaHashed {
 
 func (p *ParallelPatriciaHashed) foldNibble(nib int) error {
 	// prevbyte - can we avoid it?
-	c, d, err := p.mounts[nib].foldMounted(int(nib))
+	c, d, err := p.mounts[nib].foldMounted(nib)
 	if err != nil {
 		return err
 	}
@@ -2772,7 +2772,6 @@ func (t *Updates) ParallelHashSort(ctx context.Context, pph *ParallelPatriciaHas
 	for n := 0; n < len(t.nibbles); n++ {
 		nib := t.nibbles[n]
 		phnib := pph.mounts[n]
-		n = n
 
 		//g.Go(func() error {
 		//n = n

diff --git a/erigon-lib/state/domain_shared.go b/erigon-lib/state/domain_shared.go
@@ -1100,7 +1100,7 @@ func (sd *SharedDomains) Tx() kv.Tx { return sd.roTx }
 
 type ConcurrentSDCommitmentContext struct {
 	*SharedDomainsCommitmentContext
-	trie  *commitment.ParallelPatriciaHashed
+	// trie  *commitment.ParallelPatriciaHashed
 	accMu sync.Mutex // since code domain is queried during fetching account data, code is also behind this mutex
 	stoMu sync.Mutex
 	comMu sync.RWMutex
@@ -1151,43 +1151,43 @@ func (ctx *ConcurrentSDCommitmentContext) Storage(plainKey []byte) (u *commitmen
 
 func (ctx *ConcurrentSDCommitmentContext) ComputeCommitment(ct context.Context, saveState bool, blockNum uint64, logPrefix string) (rootHash []byte, err error) {
 	panic("nope")
-	if dbg.DiscardCommitment() {
-		ctx.updates.Reset()
-		return nil, nil
-	}
-	ctx.ResetBranchCache()
-	defer ctx.ResetBranchCache()
+	// if dbg.DiscardCommitment() {
+	// 	ctx.updates.Reset()
+	// 	return nil, nil
+	// }
+	// ctx.ResetBranchCache()
+	// defer ctx.ResetBranchCache()
 
-	mxCommitmentRunning.Inc()
-	defer mxCommitmentRunning.Dec()
-	defer func(s time.Time) { mxCommitmentTook.ObserveDuration(s) }(time.Now())
+	// mxCommitmentRunning.Inc()
+	// defer mxCommitmentRunning.Dec()
+	// defer func(s time.Time) { mxCommitmentTook.ObserveDuration(s) }(time.Now())
 
-	updateCount := ctx.updates.Size()
-	if ctx.sharedDomains.trace {
-		defer ctx.sharedDomains.logger.Trace("ComputeCommitment", "block", blockNum, "keys", updateCount, "mode", ctx.updates.Mode())
-	}
-	if updateCount == 0 {
-		rootHash, err = ctx.patriciaTrie.RootHash()
-		return rootHash, err
-	}
+	// updateCount := ctx.updates.Size()
+	// if ctx.sharedDomains.trace {
+	// 	defer ctx.sharedDomains.logger.Trace("ComputeCommitment", "block", blockNum, "keys", updateCount, "mode", ctx.updates.Mode())
+	// }
+	// if updateCount == 0 {
+	// 	rootHash, err = ctx.patriciaTrie.RootHash()
+	// 	return rootHash, err
+	// }
 
-	// data accessing functions should be set when domain is opened/shared context updated
-	ctx.trie.SetTrace(ctx.sharedDomains.trace)
-	ctx.Reset()
+	// // data accessing functions should be set when domain is opened/shared context updated
+	// ctx.trie.SetTrace(ctx.sharedDomains.trace)
+	// ctx.Reset()
 
-	rootHash, err = ctx.trie.Process(ct, ctx.updates, logPrefix)
-	if err != nil {
-		return nil, err
-	}
-	ctx.justRestored.Store(false)
+	// rootHash, err = ctx.trie.Process(ct, ctx.updates, logPrefix)
+	// if err != nil {
+	// 	return nil, err
+	// }
+	// ctx.justRestored.Store(false)
 
-	if saveState {
-		if err := ctx.storeCommitmentState(blockNum, rootHash); err != nil {
-			return nil, err
-		}
-	}
+	// if saveState {
+	// 	if err := ctx.storeCommitmentState(blockNum, rootHash); err != nil {
+	// 		return nil, err
+	// 	}
+	// }
 
-	return rootHash, err
+	// return rootHash, err
 }
 
 type SharedDomainsCommitmentContext struct {