refactor output in case of error for async callback and empty function name check #840
Conversation
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
sasurobert
reviewed
Apr 11, 2024
vmhost/contexts/output.go
Outdated
| runtime.AddError(err, runtime.FunctionName()) | ||
|
|
||
| returnCode := context.resolveReturnCodeFromError(err) | ||
| returnMessage := context.resolveReturnMessageFromError(err) | ||
|
|
||
| if callType == vm.AsynchronousCallBack { |
There was a problem hiding this comment.
this needs a feature flag.
vmhost/contexts/output.go
Outdated
| @@ -562,22 +562,60 @@ func (context *outputContext) DeployCode(input vmhost.CodeDeployInput) { | |||
| context.codeUpdates[string(input.ContractAddress)] = empty | |||
| } | |||
|
|
|||
| // createVMOutputInCaseOfErrorOfAsyncCallback appends the deletion of the async context to the output | |||
| func (context *outputContext) createVMOutputInCaseOfErrorOfAsyncCallback(err error, returnCode vmcommon.ReturnCode, returnMessage string) *vmcommon.VMOutput { | |||
There was a problem hiding this comment.
can you add a test whether this works as expected ? like checking that vmOutput has the necessary data ?
vmhost/contexts/output.go
Outdated
| } | ||
|
|
||
| vmOutput := context.outputState // GetVMOutput updates metering | ||
| context.PopSetActiveState() |
There was a problem hiding this comment.
I don't think this is needed. potSetActiveState will happen from finishExecuteOnDestContext.
There was a problem hiding this comment.
I swapped the order. AsyncV3Flag is now last.
sasurobert
reviewed
Apr 12, 2024
vmhost/flags.go
Outdated
| @@ -3,6 +3,8 @@ package vmhost | |||
| import "github.com/multiversx/mx-chain-core-go/core" | |||
|
|
|||
| const ( | |||
| // AsyncV3Flag defines the flag that activates async v3 | |||
| AsyncV3Flag core.EnableEpochFlag = "AsyncV3Flag" | |||
There was a problem hiding this comment.
this has to be the last.
There was a problem hiding this comment.
also I made a cleanup somewhere of these flags, as they are not needed. Next week we need to make a merge from a new branch to feat/asyncV3
sasurobert
approved these changes
Apr 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.