Fixes scheduled execution errors on rollback and some refactoring #3357
Conversation
…xs execution handler
…eduled execution handler
# Conflicts: # go.mod # go.sum
process/block/baseProcess_test.go
Outdated
| @@ -365,7 +365,8 @@ func CreateMockArguments( | |||
| Version: "softwareVersion", | |||
| HistoryRepository: &dblookupext.HistoryRepositoryStub{}, | |||
| EpochNotifier: &epochNotifier.EpochNotifierStub{}, | |||
| ScheduledTxsExecutionHandler: &testscommon.ScheduledTxsExecutionStub{}, | |||
| ScheduledTxsExecutionHandler: &testscommon.ScheduledTxsExecutionStub{ | |||
| }, | |||
There was a problem hiding this comment.
Could be on the same line
| return mapScheduledSCRs | ||
| } | ||
|
|
||
| func (ste *scheduledTxsExecution) createCopyScheduledSCRs() (map[block.Type][]data.TransactionHandler, int) { |
There was a problem hiding this comment.
This method is used only in GetScheduledSCRs method above, which has only two lines of code. I think that this code could be merged there and also for the debugging scope we could keep the logs as they were before.
There was a problem hiding this comment.
yes, previously I was using it in two places, removed, and added back the logs
| scheduledRootHash, mapScheduledSCRs, err := ste.getScheduledRootHashAndSCRsForHeader(headerHash) | ||
| ste.SetScheduledRootHashAndSCRs(scheduledRootHash, mapScheduledSCRs) | ||
|
|
||
| return err |
There was a problem hiding this comment.
return nil here and if err != nil { return err } before L319 ?
| func (ste *scheduledTxsExecution) SaveState(headerHash []byte) { | ||
| scheduledRootHash := ste.GetScheduledRootHash() | ||
| mapScheduledSCRs := ste.GetScheduledSCRs() | ||
| if ste.HaveScheduledTxs() { |
There was a problem hiding this comment.
Maybe this method could be removed from interface and replaced here with the check done inside it
| return scheduledRootHash, txHandlersMap, nil | ||
| } | ||
|
|
||
| func (ste *scheduledTxsExecution) getMarshalizedScheduledRootHashAndSCRs( |
There was a problem hiding this comment.
Is this used anywhere? Maybe replace L328-L342 with the call of this method?
There was a problem hiding this comment.
yes forgot to use it in SaveState
| SetScheduledRootHashAndSCRs(rootHash []byte, mapSCRs map[block.Type][]data.TransactionHandler) | ||
| GetScheduledRootHashForHeader(headerHash []byte) ([]byte, error) | ||
| RollBackToBlock(headerHash []byte) error | ||
| SaveState(headerHash []byte) | ||
| GetScheduledRootHash() []byte |
There was a problem hiding this comment.
Are GetScheduledRootHash and SetScheduledRootHash still used outside the component? If not we can remove them from interface and make them private there.
There was a problem hiding this comment.
yes, still used from baseProcess and baseSync
process/sync/baseSync.go
Outdated
| } else { | ||
| boot.scheduledTxsExecutionHandler.SetScheduledRootHash(scheduledRootHash) | ||
| boot.scheduledTxsExecutionHandler.SetScheduledSCRs(mapScheduledSCRs) | ||
| boot.scheduledTxsExecutionHandler.SetScheduledRootHashAndSCRs(prevHeader.GetRootHash(),make(map[block.Type][]data.TransactionHandler)) |
There was a problem hiding this comment.
Add a space after ,
No description provided.