remove other unintended changes from the larger BAL branch

Author: jwasinger

core/state/statedb.go

@@ -1004,7 +1004,6 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
 	var (
 		usedAddrs    []common.Address
 		deletedAddrs []common.Address
-		updatedObjs  []*stateObject
 	)
 	for addr, op := range s.mutations {
 		if op.applied {
@@ -1015,7 +1014,7 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
 		if op.isDelete() {
 			deletedAddrs = append(deletedAddrs, addr)
 		} else {
-			updatedObjs = append(updatedObjs, s.stateObjects[addr])
+			s.updateStateObject(s.stateObjects[addr])
 			s.AccountUpdated += 1
 		}
 		usedAddrs = append(usedAddrs, addr) // Copy needed for closure
@@ -1032,20 +1031,6 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
 	// Track the amount of time wasted on hashing the account trie
 	defer func(start time.Time) { s.AccountHashes += time.Since(start) }(time.Now())
 	hash := s.trie.Hash()
-	/*
-		it, err := s.trie.NodeIterator([]byte{})
-		if err != nil {
-			panic(err)
-		}
-		fmt.Println("state trie")
-		for it.Next(true) {
-			if it.Leaf() {
-				 fmt.Printf("%x: %x\n", it.Path(), it.LeafBlob())
-			} else {
-				 fmt.Printf("%x: %x\n", it.Path(), it.Hash())
-			}
-		}
-	*/
 	// If witness building is enabled, gather the account trie witness
 	if s.witness != nil {
 		witness := s.trie.Witness()