cleanups

Author: MaksymMalicki

blockchain/blockchain.go

@@ -899,7 +899,6 @@ func (b *Blockchain) updateStateRoots(
 	block *core.Block,
 	stateUpdate *core.StateUpdate,
 	newClasses map[felt.Felt]core.ClassDefinition,
-	flushChanges bool,
 ) error {
 	var height uint64
 	var err error

core/state/state.go

@@ -541,7 +541,8 @@ func (s *State) flush(
 			}
 
 			// TODO(weiihann): handle hash-based, and there should be better ways of doing this
-			if err := trieutils.DeleteStorageNodesByPath(s.batch, addr); err != nil {
+			err := trieutils.DeleteStorageNodesByPath(s.batch, addr)
+			if err != nil {
 				return err
 			}
 		} else { // updated
@@ -555,8 +556,6 @@ func (s *State) flush(
 						return err
 					}
 				}
-			}
-		}
 
 				if err := WriteNonceHistory(s.batch, &addr, blockNum, &obj.contract.Nonce); err != nil {
 					return err
@@ -567,6 +566,7 @@ func (s *State) flush(
 				}
 			}
 		}
+	}
 
 	for classHash, class := range classes {
 		if class == nil { // mark as deleted

core/state_test.go

@@ -43,7 +43,7 @@ func TestUpdate(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Run("empty state updated with mainnet block 0 state update", func(t *testing.T) {
-		require.NoError(t, state.Update(0, su0, nil, false, true))
+		require.NoError(t, state.Update(0, su0, nil, false))
 		gotNewRoot, rerr := state.Commitment()
 		require.NoError(t, rerr)
 		assert.Equal(t, su0.NewRoot, &gotNewRoot)
@@ -60,7 +60,7 @@ func TestUpdate(t *testing.T) {
 				su0.NewRoot,
 				oldRoot,
 			)
-			require.EqualError(t, state.Update(1, su, nil, false, true), expectedErr)
+			require.EqualError(t, state.Update(1, su, nil, false), expectedErr)
 		})
 
 	t.Run("error when state new root doesn't match state update's new root", func(t *testing.T) {
@@ -72,16 +72,16 @@ func TestUpdate(t *testing.T) {
 		}
 		expectedErr := fmt.Sprintf(
 			"state's current root: %s does not match the expected root: %s", su0.NewRoot, newRoot)
-		require.EqualError(t, state.Update(1, su, nil, false, true), expectedErr)
+		require.EqualError(t, state.Update(1, su, nil, false), expectedErr)
 	})
 
 	t.Run("non-empty state updated multiple times", func(t *testing.T) {
-		require.NoError(t, state.Update(1, su1, nil, false, true))
+		require.NoError(t, state.Update(1, su1, nil, false))
 		gotNewRoot, rerr := state.Commitment()
 		require.NoError(t, rerr)
 		assert.Equal(t, su1.NewRoot, &gotNewRoot)
 
-		require.NoError(t, state.Update(2, su2, nil, false, true))
+		require.NoError(t, state.Update(2, su2, nil, false))
 		gotNewRoot, err = state.Commitment()
 		require.NoError(t, err)
 		assert.Equal(t, su2.NewRoot, &gotNewRoot)
@@ -105,7 +105,7 @@ func TestUpdate(t *testing.T) {
 		})
 		require.NoError(t, state.Update(3, su3, map[felt.Felt]core.ClassDefinition{
 			*felt.NewUnsafeFromString[felt.Felt]("0xDEADBEEF"): &core.SierraClass{},
-		}, false, true))
+		}, false))
 		assert.NotEqual(t, su3.NewRoot, su3.OldRoot)
 	})
 
@@ -397,7 +397,7 @@ func TestClass(t *testing.T) {
 	require.NoError(t, state.Update(0, su0, map[felt.Felt]core.ClassDefinition{
 		*deprecatedCairoHash: deprecatedCairoClass,
 		*sierraHash:          sierraClass,
-	}, false, true))
+	}, false))
 
 	gotSierraClass, err := state.Class(sierraHash)
 	require.NoError(t, err)

core/trie2/triedb/database.go

@@ -59,14 +59,15 @@ func (d *Database) Update(
 	blockNum uint64,
 	mergeClassNodes,
 	mergeContractNodes *trienode.MergeNodeSet,
+	batch db.Batch,
 ) error {
 	switch td := d.triedb.(type) {
 	case *pathdb.Database:
 		return td.Update(root, parent, blockNum, mergeClassNodes, mergeContractNodes)
 	case *hashdb.Database:
 		return td.Update(root, parent, blockNum, mergeClassNodes, mergeContractNodes)
 	case *rawdb.Database:
-		return td.Update(root, parent, blockNum, mergeClassNodes, mergeContractNodes)
+		return td.Update(root, parent, blockNum, mergeClassNodes, mergeContractNodes, batch)
 	default:
 		return fmt.Errorf("unsupported trie db type: %T", td)
 	}

core/trie2/triedb/rawdb/database.go

@@ -85,11 +85,11 @@ func (d *Database) Update(
 	blockNum uint64,
 	mergedClassNodes *trienode.MergeNodeSet,
 	mergedContractNodes *trienode.MergeNodeSet,
+	batch db.Batch,
 ) error {
 	d.lock.Lock()
 	defer d.lock.Unlock()
 
-	batch := d.disk.NewBatch()
 	var classNodes classNodesMap
 	var classOrderedPaths []trieutils.Path
 	var contractNodes contractNodesMap

vm/vm_test.go

@@ -193,10 +193,7 @@ func TestCallCairo(t *testing.T) {
 	triedb, err := triedb.New(testDB, nil)
 	require.NoError(t, err)
 	stateDB := state.NewStateDB(testDB, triedb)
-	stateFactory, err := commonstate.NewStateFactory(statetestutils.UseNewState(), triedb, stateDB)
-	require.NoError(t, err)
-	batch := testDB.NewBatch()
-	testState, err := stateFactory.NewState(&felt.Zero, txn, batch)
+	stateFactory, err := statefactory.NewStateFactory(statetestutils.UseNewState(), triedb, stateDB)
 	require.NoError(t, err)
 	batch := testDB.NewBatch()
 	state, err := stateFactory.NewState(&felt.Zero, txn, batch)
@@ -276,11 +273,7 @@ func TestCallCairo(t *testing.T) {
 			},
 		},
 	}
-	require.NoError(t, state.Update(1, &secondStateUpdate, nil, false, true))
-	if statetestutils.UseNewState() {
-		require.NoError(t, batch.Write())
-	}
-
+	require.NoError(t, state.Update(1, &secondStateUpdate, nil, false))
 	if statetestutils.UseNewState() {
 		require.NoError(t, batch.Write())
 	}