Remove duplicate update/delete on tire (#1001)

* rm duplicate update/delete on tire
* rm useless code

core/state/state_object.go

@@ -411,14 +411,9 @@ func (s *StateObject) updateTrie(db Database) Trie {
 		}
 		s.originStorage[key] = value
 		var v []byte
-		if (value == common.Hash{}) {
-			s.setError(tr.TryDelete(key[:]))
-			s.db.StorageDeleted += 1
-		} else {
+		if value != (common.Hash{}) {
 			// Encoding []byte cannot fail, ok to ignore the error.
 			v, _ = rlp.EncodeToBytes(common.TrimLeftZeroes(value[:]))
-			s.setError(tr.TryUpdate(key[:], v))
-			s.db.StorageUpdated += 1
 		}
 		dirtyStorage[key] = v
 	}
@@ -447,10 +442,10 @@ func (s *StateObject) updateTrie(db Database) Trie {
 				storage = make(map[string][]byte, len(dirtyStorage))
 				s.db.snapStorage[s.address] = storage
 			}
+			s.db.snapStorageMux.Unlock()
 			for key, value := range dirtyStorage {
 				storage[string(key[:])] = value
 			}
-			s.db.snapStorageMux.Unlock()
 		}()
 	}
 	wg.Wait()