Pass predefined blocks via the CLI #2094
Merged
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
Co-authored-by: Mitchell Turner <[email protected]>
…ure/pass-oredefined-blocks-via-cli
…rror instead of ignore
…ure/pass-oredefined-blocks-via-cli # Conflicts: # crates/services/consensus_module/poa/src/service.rs
xgreenx
commented
Aug 16, 2024
| )); | ||
| } | ||
|
|
||
| if on_chain_height > target_block_height { | ||
| self.on_chain().rollback_last_block()?; | ||
| tracing::info!( |
There was a problem hiding this comment.
We have the same log inside of the rollback_last_block
MitchTurner
reviewed
Aug 16, 2024
| Ok(latest_height) | ||
| } | ||
|
|
||
| fn rollback_block_at(&self, height_to_rollback: u64) -> StorageResult<()> { |
There was a problem hiding this comment.
I think I'd prefer the name
Suggested change
| fn rollback_block_at(&self, height_to_rollback: u64) -> StorageResult<()> { | |
| fn rollback_block_to(&self, height: u64) -> StorageResult<()> { |
| @@ -177,7 +177,7 @@ impl worker::OffChainDatabase for Database<OffChain> { | |||
| type Transaction<'a> = StorageTransaction<&'a mut Self> where Self: 'a; | |||
|
|
|||
| fn latest_height(&self) -> StorageResult<Option<BlockHeight>> { | |||
| self.latest_height() | |||
| Ok(fuel_core_storage::transactional::HistoricalView::latest_height(self)) | |||
There was a problem hiding this comment.
Let's use normal method syntax.
| @@ -140,6 +140,6 @@ impl OnChainDatabase for OnChainIterableKeyValueView {} | |||
|
|
|||
| impl worker::OnChainDatabase for Database<OnChain> { | |||
| fn latest_height(&self) -> StorageResult<Option<BlockHeight>> { | |||
| self.latest_height() | |||
| Ok(fuel_core_storage::transactional::HistoricalView::latest_height(self)) | |||
There was a problem hiding this comment.
Let's use normal method syntax.
crates/fuel-core/src/state.rs
Outdated
| @@ -71,7 +71,7 @@ pub trait TransactableStorage<Height>: IterableStore + Debug + Send + Sync { | |||
|
|
|||
| fn latest_view(&self) -> StorageResult<IterableKeyValueView<Self::Column>>; | |||
|
|
|||
| fn rollback_last_block(&self) -> StorageResult<()>; | |||
| fn rollback_block_at(&self, height: &Height) -> StorageResult<()>; | |||
There was a problem hiding this comment.
I think I prefer
Suggested change
| fn rollback_block_at(&self, height: &Height) -> StorageResult<()>; | |
| fn rollback_block_to(&self, height: &Height) -> StorageResult<()>; |
…via-cli # Conflicts: # CHANGELOG.md # crates/fuel-core/src/service/sub_services.rs # crates/services/consensus_module/poa/src/ports.rs # crates/services/consensus_module/poa/src/service.rs
MitchTurner
approved these changes
Aug 17, 2024
Merged
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.
Follow-up PR for #2081.
Closes #1902
Add a CLI argument to process predefined blocks.
Checklist
Before requesting review