fix after merge

multiversx · Dec 12, 2024 · bf0f1b6 · bf0f1b6
1 parent 1ae9ffb
commit bf0f1b6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/trie/baseNode.go b/trie/baseNode.go
@@ -15,6 +15,9 @@ type baseNode struct {
 }
 
 func (bn *baseNode) getHash() []byte {
+	bn.mutex.RLock()
+	defer bn.mutex.RUnlock()
+
 	return bn.hash
 }
 
@@ -23,6 +26,9 @@ func (bn *baseNode) setGivenHash(hash []byte) {
 }
 
 func (bn *baseNode) isDirty() bool {
+	bn.mutex.RLock()
+	defer bn.mutex.RUnlock()
+
 	return bn.dirty
 }
 

diff --git a/trie/patriciaMerkleTrie.go b/trie/patriciaMerkleTrie.go
@@ -313,13 +313,13 @@ func (tr *patriciaMerkleTrie) getRootHash() ([]byte, error) {
 		return hash, nil
 	}
 
-	manager, err := NewGoroutinesManager(tr.goroutinesThrottler, errChan.NewErrChanWrapper(), tr.chanClose)
+	err := tr.goRoutinesManager.SetNewErrorChannel(errChan.NewErrChanWrapper())
 	if err != nil {
 		return nil, err
 	}
 
-	rootNode.setHash(manager)
-	err = manager.GetError()
+	rootNode.setHash(tr.goRoutinesManager)
+	err = tr.goRoutinesManager.GetError()
 	if err != nil {
 		return nil, err
 	}
@@ -353,13 +353,13 @@ func (tr *patriciaMerkleTrie) Commit() error {
 		return nil
 	}
 
-	manager, err := NewGoroutinesManager(tr.goroutinesThrottler, errChan.NewErrChanWrapper(), tr.chanClose)
+	err = tr.goRoutinesManager.SetNewErrorChannel(errChan.NewErrChanWrapper())
 	if err != nil {
 		return err
 	}
 
-	rootNode.setHash(manager)
-	err = manager.GetError()
+	rootNode.setHash(tr.goRoutinesManager)
+	err = tr.goRoutinesManager.GetError()
 	if err != nil {
 		return err
 	}
@@ -482,13 +482,13 @@ func (tr *patriciaMerkleTrie) GetDirtyHashes() (common.ModifiedHashes, error) {
 		return nil, nil
 	}
 
-	manager, err := NewGoroutinesManager(tr.goroutinesThrottler, errChan.NewErrChanWrapper(), tr.chanClose)
+	err = tr.goRoutinesManager.SetNewErrorChannel(errChan.NewErrChanWrapper())
 	if err != nil {
 		return nil, err
 	}
 
-	rootNode.setHash(manager)
-	err = manager.GetError()
+	rootNode.setHash(tr.goRoutinesManager)
+	err = tr.goRoutinesManager.GetError()
 	if err != nil {
 		return nil, err
 	}