Merge remote-tracking branch 'origin/refactor-trie-set-hash' into ref…

…actor-trie-commit

state/accountsDB.go

@@ -533,6 +533,8 @@ func (adb *AccountsDB) removeCodeAndDataTrie(acnt vmcommon.AccountHandler) error
 		return nil
 	}
 
+	// TODO find a method to remove the data trie and mark all the removed hashes for pruning.
+	// There can be a lot of hashes to be removed, so take into consideration the mem usage and the time needed to remove them.
 	return adb.removeCode(baseAcc)
 }
 

trie/baseNode.go

@@ -1,9 +1,10 @@
 package trie
 
 import (
+	"sync"
+
 	"github.com/multiversx/mx-chain-core-go/hashing"
 	"github.com/multiversx/mx-chain-core-go/marshal"
-	"sync"
 )
 
 type baseNode struct {
@@ -15,6 +16,8 @@ type baseNode struct {
 }
 
 func (bn *baseNode) getHash() []byte {
+	//TODO add mutex protection for all methods
+
 	bn.mutex.RLock()
 	defer bn.mutex.RUnlock()
 

trie/interface.go

@@ -12,7 +12,7 @@ import (
 	vmcommon "github.com/multiversx/mx-chain-vm-common-go"
 )
 
-type node interface {
+type baseTrieNode interface {
 	getHash() []byte
 	setGivenHash([]byte)
 	setDirty(bool)
@@ -21,9 +21,11 @@ type node interface {
 	setMarshalizer(marshal.Marshalizer)
 	getHasher() hashing.Hasher
 	setHasher(hashing.Hasher)
+}
 
+type node interface {
+	baseTrieNode
 	setHash(goRoutinesManager common.TrieGoroutinesManager)
-
 	getCollapsed() (node, error) // a collapsed node is a node that instead of the children holds the children hashes
 	getEncodedNode() ([]byte, error)
 	hashNode() ([]byte, error)

trie/patriciaMerkleTrie.go

@@ -207,7 +207,7 @@ func (tr *patriciaMerkleTrie) insertBatch(sortedDataForInsertion []core.TrieData
 	}
 
 	rootNode := tr.GetRootNode()
-	if rootNode == nil {
+	if check.IfNil(rootNode) {
 		newRoot, err := newLeafNode(sortedDataForInsertion[0], tr.marshalizer, tr.hasher)
 		if err != nil {
 			return err

trie/rootManager.go

@@ -6,6 +6,8 @@ import (
 	"github.com/multiversx/mx-chain-core-go/core/check"
 )
 
+// TODO: add unit tests
+
 type rootManager struct {
 	root         node
 	oldHashes    [][]byte