Skip to content

Commit

Permalink
use luastate for statesql
Browse files Browse the repository at this point in the history
  • Loading branch information
rabbitprincess committed Nov 27, 2023
1 parent 76870f0 commit d5d3c8c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion chain/chainhandle.go
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ func (e *blockExecutor) execute() error {
return err
}

if err := contract.SaveRecoveryPoint(e.BlockState); err != nil {
if err := contract.SaveRecoveryPoint(e.BlockState.LuaStateDB); err != nil {
return err
}

Expand Down
8 changes: 4 additions & 4 deletions contract/statesql.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

"github.com/aergoio/aergo-lib/log"
"github.com/aergoio/aergo/v2/internal/enc/base58"
"github.com/aergoio/aergo/v2/state"
"github.com/aergoio/aergo/v2/state/statedb"
"github.com/aergoio/aergo/v2/types"
)

Expand Down Expand Up @@ -126,7 +126,7 @@ func CloseDatabase() {
}
}

func SaveRecoveryPoint(bs *state.BlockState) error {
func SaveRecoveryPoint(luaState *statedb.StateDB) error {
defer CloseDatabase()

for id, db := range database.DBs {
Expand All @@ -145,13 +145,13 @@ func SaveRecoveryPoint(bs *state.BlockState) error {
if sqlLgr.IsDebugEnabled() {
sqlLgr.Debug().Str("db_name", id).Uint64("commit_id", rp).Msg("save recovery point")
}
receiverState, err := bs.LuaStateDB.GetAccountState(db.accountID)
receiverState, err := luaState.GetAccountState(db.accountID)
if err != nil {
return err
}
receiverChange := receiverState.Clone()
receiverChange.SqlRecoveryPoint = uint64(rp)
err = bs.LuaStateDB.PutState(db.accountID, receiverChange)
err = luaState.PutState(db.accountID, receiverChange)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion contract/vm_direct/vm_direct.go
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ func (e *blockExecutor) execute() error {
return err
}

if err := contract.SaveRecoveryPoint(e.BlockState); err != nil {
if err := contract.SaveRecoveryPoint(e.BlockState.LuaStateDB); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion contract/vm_dummy/vm_dummy.go
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ func (bc *DummyChain) ConnectBlock(txs ...LuaTxTester) error {
return err
}
}
err := contract.SaveRecoveryPoint(blockState)
err := contract.SaveRecoveryPoint(blockState.LuaStateDB)
if err != nil {
return err
}
Expand Down

0 comments on commit d5d3c8c

Please sign in to comment.