Skip to content

Commit e9d651f

Browse files
committed
fixes after update
1 parent 6866dd9 commit e9d651f

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

core/common_state.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ type CommonState interface {
1717
update *StateUpdate,
1818
declaredClasses map[felt.Felt]ClassDefinition,
1919
skipVerifyNewRoot bool,
20-
flushChanges bool,
2120
) error
2221
Revert(blockNum uint64, update *StateUpdate) error
2322
Commitment() (felt.Felt, error)

core/state/state_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func TestClass(t *testing.T) {
265265
require.NoError(t, state.Update(0, su0, map[felt.Felt]core.ClassDefinition{
266266
*deprecatedCairoHash: deprecatedCairoClass,
267267
*sierraHash: sierraClass,
268-
}, false, true))
268+
}, false))
269269
require.NoError(t, batch.Write())
270270
gotSierraClass, err := state.Class(sierraHash)
271271
require.NoError(t, err)

core/state/statefactory/state_factory.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ func NewStateFactory(
3434
func (sf *StateFactory) NewState(
3535
stateRoot *felt.Felt,
3636
txn db.IndexedBatch,
37+
batch db.Batch,
3738
) (core.CommonState, error) {
3839
if !sf.UseNewState {
3940
deprecatedState := core.NewState(txn)
4041
return deprecatedState, nil
4142
}
4243

43-
state, err := state.New(stateRoot, sf.stateDB)
44+
state, err := state.New(stateRoot, sf.stateDB, batch)
4445
if err != nil {
4546
return nil, err
4647
}
@@ -72,7 +73,7 @@ func (sf *StateFactory) EmptyState() (core.CommonStateReader, error) {
7273
emptyState := core.NewState(txn)
7374
return emptyState, nil
7475
}
75-
state, err := state.New(&felt.Zero, sf.stateDB)
76+
state, err := state.New(&felt.Zero, sf.stateDB, nil)
7677
if err != nil {
7778
return nil, err
7879
}

db/pebble/db.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,19 @@ type DB struct {
2828

2929
// New opens a new database at the given path with default options
3030
func New(path string, options ...Option) (db.KeyValueStore, error) {
31-
opts := pebble.Options{}
32-
for _, option := range options {
33-
if err := option(&opts); err != nil {
34-
return nil, err
35-
}
36-
}
37-
38-
opts := &pebble.Options{
39-
Logger: dbLog,
40-
Cache: pebble.NewCache(int64(cacheSizeMB * utils.Megabyte)),
41-
MaxOpenFiles: maxOpenFiles,
31+
opts := pebble.Options{
4232
L0CompactionFileThreshold: 8,
4333
L0StopWritesThreshold: 24,
4434
MemTableSize: 8 * utils.Megabyte,
4535
MaxConcurrentCompactions: func() int { return 2 },
4636
}
37+
for _, option := range options {
38+
if err := option(&opts); err != nil {
39+
return nil, err
40+
}
41+
}
4742

48-
return newPebble(path, opts)
43+
return newPebble(path, &opts)
4944
}
5045

5146
func newPebble(path string, options *pebble.Options) (*DB, error) {

vm/vm_test.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ func TestCallCairo(t *testing.T) {
198198
batch := testDB.NewBatch()
199199
testState, err := stateFactory.NewState(&felt.Zero, txn, batch)
200200
require.NoError(t, err)
201-
state, err := stateFactory.NewState(&felt.Zero, txn)
201+
batch := testDB.NewBatch()
202+
state, err := stateFactory.NewState(&felt.Zero, txn, batch)
202203
newRoot := felt.NewUnsafeFromString[felt.Felt](
203204
"0x2650cef46c190ec6bb7dc21a5a36781132e7c883b27175e625031149d4f1a84",
204205
)
@@ -212,7 +213,7 @@ func TestCallCairo(t *testing.T) {
212213
},
213214
}
214215
declaredClass := map[felt.Felt]core.ClassDefinition{*classHash: simpleClass}
215-
require.NoError(t, state.Update(0, &firstStateUpdate, declaredClass, false, true))
216+
require.NoError(t, state.Update(0, &firstStateUpdate, declaredClass, false))
216217
require.NoError(t, batch.Write())
217218

218219
logLevel := utils.NewLogLevel(utils.ERROR)
@@ -280,6 +281,10 @@ func TestCallCairo(t *testing.T) {
280281
require.NoError(t, batch.Write())
281282
}
282283

284+
if statetestutils.UseNewState() {
285+
require.NoError(t, batch.Write())
286+
}
287+
283288
ret, err = vm.Call(
284289
&callInfo,
285290
&BlockInfo{Header: &core.Header{Number: 1}},

0 commit comments

Comments
 (0)