This repository was archived by the owner on Nov 15, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Add JSON format to import blocks and set it as default #5816
Merged
Merged
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit
Hold shift + click to select a range
0bb1eb7
Add BlockStream Enum and utility fn
b291ff1
WIP: Modify import closure to work with BlockStream
49b0144
Fix trait bounds
cb6aded
Working prototype
155695d
Revamp block importing
e59e1ad
Add export_import_flow tests
7b729fe
Merge branch 'master' of github.com:paritytech/substrate into scott_d…
69a8bff
Add comments and clean code
ab173a5
Add more comments in the import fn
e22ed9b
Add link code to import function
00fbd6c
Add condition when returning Ready(Ok(()) to make sure we've imported…
e7a3c4d
Add check for imported blocks in JSON case
56d49fa
Use rest pattern
ff75523
Fix compilation error for undeclared variable
7c66af2
Add polling and waker before pending
419b0ab
Print read_block_count instead of count
be1d626
Simplify binary cli option with structopt
a67a75d
Update test to reflect changes in CLI api
e1ce1aa
Change Stream to take SignedBlock<B> instead of B
30f60de
Merge branch 'master' of github.com:paritytech/substrate into scott_d…
ecf8729
Add comments to BlockStream
7b8f34c
Move out logic to smaller functions for clearer code
1a9e910
Merge branch 'master' of github.com:paritytech/substrate into scott_d…
61260b5
Remove result over import_blocks return type
4ca8fe6
Check for error in command output rather than simply checking command…
c986b44
Revamp export/import/revert testing
8b3a17a
Fix minor typos and formatting errors
pscott c57415b
Remove unnecessary if condition in terminating condition
pscott 32eb4af
Explicit error instead of returning it as a string
pscott 412e942
Pass BlockStream to log_importing_status_updates and simplify matchin…
2266d67
Use .contains() instead of regex match
f62d5e0
Line break in match block; return future::ready instead of poll_fn
ad44445
Update Cargo.lock
17f4c74
Add check so that queue doesn't grow too big
994157c
Use Iterator instead of Stream
4d1234e
Remove allow dead_code
37ae67b
Merge branch 'master' of github.com:paritytech/substrate into scott_d…
757693d
Remove outdated comments
pscott 9865fae
Return Errors instead of logging them
1150f12
Simplify match arms
pscott 377823c
Remove check before terminating block import
576606c
Apply suggestions from code review
bkchr 9b4658a
Check that queue is not full BEFORE calling
76a5954
Revert "Remove check before terminating block import"
f848a05
Improve unit tests to make sure we actually import blocks
d924935
Remove Unpin implementation for BlockIter
3d00933
Add prototype of enum for ImportStates
fb040fc
Add working prototype for StateMachine
4f9bcf8
Add comments for clearer code
9a134eb
Add sleep before calling Waker when waiting for import queue
fdd3683
Merge branch 'master' of github.com:paritytech/substrate into scott_d…
d98c92d
Add Speedometer
344286e
Merge branch 'master' of github.com:paritytech/substrate into scott_d…
5bdc4fd
add dbg!(&log) for test debugging
5d1f1e3
Fix lines with more than 100 cols
768c309
Merge branch 'master' of github.com:paritytech/substrate into scott_d…
a17cc1e
Fix regex capture for test
9d7d7a1
Update regexes to take to capture the whole number
03a5cc8
Merge branch 'master' of github.com:paritytech/substrate into scott_d…
ef02ec3
Rename Cmd to Command
pscott fb91c53
Actually rename Cmd to Command
4f067ef
Apply suggestions from code review
gnunicorn 0c47a45
Merge branch 'master' of github.com:paritytech/substrate into scott_d…
196de60
Fix compilation errors for tests
731f1b7
Merge branch 'scott_default_json_import_blocks' of github.com:parityt…
f43f3de
Fix compilation errors from code review suggestion
cdc1290
Update bin/node/cli/tests/export_import_flow.rs
gavofyork File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add check for imported blocks in JSON case
- Loading branch information
There are no files selected for viewing
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.