minor fixes after rebase

Author: MaksymMalicki

core/contract.go

@@ -169,8 +169,7 @@ func ContractStorage(addr, key *felt.Felt, txn db.IndexedBatch) (felt.Felt, erro
 	if err != nil {
 		return felt.Felt{}, err
 	}
-	storage, err := cStorage.Get(key)
-	return storage, err
+	return cStorage.Get(key)
 }
 
 // ContractClassHash returns hash of the class that the contract at the given address instantiates.

core/trie/trie_test.go

@@ -175,8 +175,7 @@ func TestPutZero(t *testing.T) {
 			require.NoError(t, err)
 			keys = append(keys, key)
 
-			var root felt.Felt
-			root, err = tempTrie.Root()
+			root, err := tempTrie.Hash()
 			require.NoError(t, err)
 			roots = append(roots, &root)
 		}
@@ -239,8 +238,7 @@ func TestTrie(t *testing.T) {
 			require.NoError(t, err)
 			keys = append(keys, key)
 
-			var root felt.Felt
-			root, err = tempTrie.Root()
+			root, err := tempTrie.Hash()
 			require.NoError(t, err)
 			roots = append(roots, &root)
 		}

core/trie2/triedb/rawdb/database.go

@@ -100,26 +100,29 @@ func (d *Database) Update(
 	}
 
 	for path, n := range classNodes {
-		if err := d.updateNode(batch, db.ClassTrie, &felt.Address{}, &path, n, true); err != nil {
+		err := d.updateNode(batch, db.ClassTrie, &felt.Address{}, &path, n, true)
+		if err != nil {
 			return err
 		}
 	}
 
 	for path, n := range contractNodes {
-		if err := d.updateNode(batch, db.ContractTrieContract, &felt.Address{}, &path, n, false); err != nil {
+		err := d.updateNode(batch, db.ContractTrieContract, &felt.Address{}, &path, n, false)
+		if err != nil {
 			return err
 		}
 	}
 
 	for owner, nodes := range contractStorageNodes {
 		for path, n := range nodes {
-			if err := d.updateNode(batch, db.ContractTrieStorage, &owner, &path, n, false); err != nil {
+			err := d.updateNode(batch, db.ContractTrieStorage, &owner, &path, n, false)
+			if err != nil {
 				return err
 			}
 		}
 	}
 
-	return nil
+	return batch.Write()
 }
 
 func (d *Database) updateNode(
@@ -131,19 +134,21 @@ func (d *Database) updateNode(
 	isClass bool,
 ) error {
 	if _, deleted := n.(*trienode.DeletedNode); deleted {
-		if err := trieutils.DeleteNodeByPath(batch, bucket, owner, path, n.IsLeaf()); err != nil {
+		err := trieutils.DeleteNodeByPath(batch, bucket, owner, path, n.IsLeaf())
+		if err != nil {
 			return err
 		}
 		d.cleanCache.deleteNode(owner, path, isClass)
 	} else {
-		if err := trieutils.WriteNodeByPath(
+		err := trieutils.WriteNodeByPath(
 			batch,
 			bucket,
 			owner,
 			path,
 			n.IsLeaf(),
 			n.Blob(),
-		); err != nil {
+		)
+		if err != nil {
 			return err
 		}
 		d.cleanCache.putNode(owner, path, isClass, n.Blob())