forked from okx/xlayer-node
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
allow rpc to access the ForkID directly from DB (0xPolygonHermez#3197)
* allow rpc to access the ForkID directly from DB * update docs * fix migration down; check for greater forkIDs instead of the next +1 (0xPolygonHermez#3182) * fix state storage config initialization * add tests and fix get forkID by block number * fix test TestGetForkIDByBlockNumber --------- Co-authored-by: agnusmor <[email protected]>
- Loading branch information
Showing
5 changed files
with
147 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| package pgstatestorage_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/0xPolygonHermez/zkevm-node/state" | ||
| "github.com/0xPolygonHermez/zkevm-node/state/pgstatestorage" | ||
| "github.com/0xPolygonHermez/zkevm-node/test/dbutils" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestAddForkIDInterval(t *testing.T) { | ||
| if err := dbutils.InitOrResetState(stateDBCfg); err != nil { | ||
| panic(err) | ||
| } | ||
| pgStateStorage = pgstatestorage.NewPostgresStorage(state.Config{}, stateDb) | ||
| testState = state.NewState(stateCfg, pgStateStorage, executorClient, stateTree, nil, nil) | ||
|
|
||
| for i := 1; i <= 6; i++ { | ||
| err = testState.AddForkID(ctx, state.ForkIDInterval{ForkId: uint64(i), BlockNumber: uint64(i * 100), FromBatchNumber: uint64(i * 10), ToBatchNumber: uint64(i*10) + 9}, nil) | ||
| require.NoError(t, err) | ||
| } | ||
|
|
||
| testCases := []struct { | ||
| name string | ||
| forkIDToAdd state.ForkIDInterval | ||
| expectedError error | ||
| }{ | ||
| { | ||
| name: "fails to add because forkID already exists", | ||
| forkIDToAdd: state.ForkIDInterval{ForkId: 3}, | ||
| expectedError: fmt.Errorf("error checking forkID sequence. Last ForkID stored: 6. New ForkID received: 3"), | ||
| }, | ||
| { | ||
| name: "fails to add because forkID is smaller than the latest forkID", | ||
| forkIDToAdd: state.ForkIDInterval{ForkId: 5}, | ||
| expectedError: fmt.Errorf("error checking forkID sequence. Last ForkID stored: 6. New ForkID received: 5"), | ||
| }, | ||
| { | ||
| name: "fails to add because forkID is equal to the latest forkID", | ||
| forkIDToAdd: state.ForkIDInterval{ForkId: 6}, | ||
| expectedError: fmt.Errorf("error checking forkID sequence. Last ForkID stored: 6. New ForkID received: 6"), | ||
| }, | ||
| { | ||
| name: "adds successfully", | ||
| forkIDToAdd: state.ForkIDInterval{ForkId: 7}, | ||
| expectedError: nil, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| tc := tc | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| ctx := context.Background() | ||
| dbTx, err := testState.BeginStateTransaction(ctx) | ||
| require.NoError(t, err) | ||
|
|
||
| err = testState.AddForkIDInterval(ctx, tc.forkIDToAdd, dbTx) | ||
|
|
||
| if tc.expectedError == nil { | ||
| assert.Nil(t, err) | ||
| } else { | ||
| assert.Equal(t, tc.expectedError.Error(), err.Error()) | ||
| } | ||
|
|
||
| require.NoError(t, dbTx.Commit(ctx)) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestGetForkID(t *testing.T) { | ||
| if err := dbutils.InitOrResetState(stateDBCfg); err != nil { | ||
| panic(err) | ||
| } | ||
| pgStateStorage = pgstatestorage.NewPostgresStorage(stateCfg, stateDb) | ||
| testState = state.NewState(stateCfg, pgStateStorage, executorClient, stateTree, nil, nil) | ||
| st := state.NewState(stateCfg, pgstatestorage.NewPostgresStorage(stateCfg, stateDb), executorClient, stateTree, nil, nil) | ||
|
|
||
| avoidMemoryStateCfg := stateCfg | ||
| avoidMemoryStateCfg.AvoidForkIDInMemory = true | ||
| pgStateStorageAvoidMemory := pgstatestorage.NewPostgresStorage(avoidMemoryStateCfg, stateDb) | ||
| stAvoidMemory := state.NewState(avoidMemoryStateCfg, pgStateStorageAvoidMemory, executorClient, stateTree, nil, nil) | ||
|
|
||
| // persist forkID intervals | ||
| forkIdIntervals := []state.ForkIDInterval{} | ||
| for i := 1; i <= 6; i++ { | ||
| forkIDInterval := state.ForkIDInterval{ForkId: uint64(i), BlockNumber: uint64(i * 100), FromBatchNumber: uint64(i * 10), ToBatchNumber: uint64(i*10) + 9} | ||
| forkIdIntervals = append(forkIdIntervals, forkIDInterval) | ||
| err = testState.AddForkID(ctx, forkIDInterval, nil) | ||
| require.NoError(t, err) | ||
| } | ||
|
|
||
| // updates the memory with some of the forkIDs | ||
| forkIdIntervalsToAddInMemory := forkIdIntervals[0:3] | ||
| st.UpdateForkIDIntervalsInMemory(forkIdIntervalsToAddInMemory) | ||
| stAvoidMemory.UpdateForkIDIntervalsInMemory(forkIdIntervalsToAddInMemory) | ||
|
|
||
| // get forkID by blockNumber | ||
| forkIDFromMemory := st.GetForkIDByBlockNumber(500) | ||
| assert.Equal(t, uint64(3), forkIDFromMemory) | ||
|
|
||
| forkIDFromDB := stAvoidMemory.GetForkIDByBlockNumber(500) | ||
| assert.Equal(t, uint64(5), forkIDFromDB) | ||
|
|
||
| // get forkID by batchNumber | ||
| forkIDFromMemory = st.GetForkIDByBatchNumber(45) | ||
| assert.Equal(t, uint64(3), forkIDFromMemory) | ||
|
|
||
| forkIDFromDB = stAvoidMemory.GetForkIDByBatchNumber(45) | ||
| assert.Equal(t, uint64(4), forkIDFromDB) | ||
|
|
||
| // updates the memory with some of the forkIDs | ||
| forkIdIntervalsToAddInMemory = forkIdIntervals[0:6] | ||
| st.UpdateForkIDIntervalsInMemory(forkIdIntervalsToAddInMemory) | ||
| stAvoidMemory.UpdateForkIDIntervalsInMemory(forkIdIntervalsToAddInMemory) | ||
|
|
||
| // get forkID by blockNumber | ||
| forkIDFromMemory = st.GetForkIDByBlockNumber(500) | ||
| assert.Equal(t, uint64(5), forkIDFromMemory) | ||
|
|
||
| forkIDFromDB = stAvoidMemory.GetForkIDByBlockNumber(500) | ||
| assert.Equal(t, uint64(5), forkIDFromDB) | ||
|
|
||
| // get forkID by batchNumber | ||
| forkIDFromMemory = st.GetForkIDByBatchNumber(45) | ||
| assert.Equal(t, uint64(4), forkIDFromMemory) | ||
|
|
||
| forkIDFromDB = stAvoidMemory.GetForkIDByBatchNumber(45) | ||
| assert.Equal(t, uint64(4), forkIDFromDB) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters