Merge pull request #2119 from karalabe/statedb-batch-commit

core/state: always commit in batches, just finish if not needed later

1 files changed, 2 insertions, 1 deletions

diff --git a/core/state/statedb.go b/core/state/statedb.go
index 413321057..8093472b5 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -353,7 +353,8 @@ func (s *StateDB) IntermediateRoot() common.Hash {
 
 // Commit commits all state changes to the database.
 func (s *StateDB) Commit() (root common.Hash, err error) {
-	return s.commit(s.db)
+	root, batch := s.CommitBatch()
+	return root, batch.Write()
 }
 
 // CommitBatch commits all state changes to a write batch but does not