Updates market actor #496
Merged
Updates market actor #496
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
dutterbutter
requested review from
ansermino,
austinabell and
ec2
as code owners
austinabell
suggested changes
Jun 11, 2020
| @@ -111,60 +362,51 @@ impl State { | |||
| }) | |||
| } | |||
|
|
|||
| pub(super) fn maybe_lock_balance<BS: BlockStore>( | |||
| fn maybe_lock_balance<BS: BlockStore>( | |||
| &mut self, | |||
| store: &BS, | |||
| addr: &Address, | |||
| amount: &TokenAmount, | |||
| ) -> Result<(), ActorError> { | |||
There was a problem hiding this comment.
This fn should now not return an actor error, since it might cause issues with the caller assuming the exit code is handled correctly (which it isn't here)
There was a problem hiding this comment.
As discussed, this will return an Actor Error due to the usage of get_locked_balance and get_escrow_balance returning an ActorError.
austinabell
added
the
Spec Change
| })?; | ||
| .map_err(|e| ActorError::new(ExitCode::ErrIllegalState, e.into()))?; | ||
|
|
||
| if deal.is_some() { |
There was a problem hiding this comment.
You can also do
deal.ok_or_else(|_|ActorError::new(ExitCode::ErrIllegalArgument,format!("given deal already included in another sector: {}", id)))?
StaticallyTypedAnxiety
approved these changes
Jun 13, 2020
austinabell
reviewed
Jun 13, 2020
austinabell
reviewed
Jun 15, 2020
austinabell
approved these changes
Jun 18, 2020
timvermeulen
pushed a commit
that referenced
this pull request
Jun 22, 2020
* initial market actor updates * fix market actor errs * fix linting issue * made requested changes * update error msg * added verifreg to internal send and mockrt * updated multimap error handling
timvermeulen
added a commit
that referenced
this pull request
Jun 26, 2020
* Bitfield improvements * Store prefix bits in separate variables * Use the `Result` type alias in reader.rs * Remove unused dependency * Avoid creating vectors unnecessarily * Rename union to merge * Rename multi_union to union * Combine first access with is_empty check * Avoid traversing `self.unset` up front in `BitField::iter` * Updates market actor (#496) * initial market actor updates * fix market actor errs * fix linting issue * made requested changes * update error msg * added verifreg to internal send and mockrt * updated multimap error handling * Update proofs to v4 (#507) * Bump dep versions * Refactor to new proofs types * Switch to from trait and cleanup * Update bootnodes and genesis for testnet (#509) * Remove unnecessary >= * Get rid of redundant `get_mut` * Add UnverifiedBitField type in order to deserialize a bit field without verifying it * Rename RLEPlus to RlePlus in accordance with Rust's naming conventions * Remove pointless mutable reference * Remove UnverifiedBitField * Make sure that RlePlus::new returns an error on integer overflow * Don't yield a run of length 0 whenever a short block has the value 0 Co-authored-by: Dustin Brickwood <dustinbrickwood204@gmail.com> Co-authored-by: Austin Abell <austinabell8@gmail.com>
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.
Summary of changes
Changes introduced in this pull request:
Please advise on the best way to handle some of the errors in market_state, as you will see its not quite 1:1 at the moment since they are mixing err types.
Reference issue to close (if applicable)
Closes #461
Other information and links