Refactor SyncState #3297
Merged
Refactor SyncState #3297
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
Method sync_error() retrun type was simplified. update_txhashset_download() was made type safe, which eliminates a runtime enum variant's check
antiochp
reviewed
Apr 17, 2020
hashmap
commented
Apr 17, 2020
| @@ -114,37 +144,54 @@ impl SyncState { | |||
| } | |||
|
|
|||
| /// Update the syncing status | |||
| pub fn update(&self, new_status: SyncStatus) { | |||
| if self.status() == new_status { | |||
There was a problem hiding this comment.
This check is not great, we take a read lock, compare and then release the lock, so when we obtain a write lock the state may be different already.
| /// Update the syncing status if predicate f is satisfied | ||
| pub fn update_if<F>(&self, new_status: SyncStatus, f: F) -> bool | ||
| where | ||
| F: Fn(SyncStatus) -> bool, |
There was a problem hiding this comment.
it's a bit awkward to have predicate here, but some variants of SyncStatus have state attached which makes matching painful
| /// Communicate sync error | ||
| pub fn set_sync_error(&self, error: Error) { | ||
| *self.sync_error.write() = Some(error); | ||
| } | ||
|
|
||
| /// Get sync error | ||
| pub fn sync_error(&self) -> Arc<RwLock<Option<Error>>> { | ||
| Arc::clone(&self.sync_error) | ||
| pub fn sync_error(&self) -> Option<String> { |
There was a problem hiding this comment.
We don't need Error per se, just the fact of its existence and description, returning String makes life much easier
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.
Method
sync_error()return type was simplified.update_txhashset_download()was made type safe, which eliminates a runtime enum variant's check. As a bonus matching code is shorter and simpler when we do a partial destructuing, which happens quite often.