Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

core/finality-grandpa: Request block sync from network after import timeout #3800

Merged
andresilva merged 26 commits into from
Oct 24, 2019
Merged

core/finality-grandpa: Request block sync from network after import timeout #3800

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
afdc964
core/finality-grandpa: Pass Grandpa msg sender up to UntilImported
mxinden Oct 8, 2019
61ac9dd
core/finality-grandpa: Track senders to maybe later request blocks
mxinden Oct 8, 2019
ce9db3f
core/finality-grandpa: Make BlockStatus pub only within crate
mxinden Oct 10, 2019
3cd6de0
core/finality-grandpa: Abstract NetworkBridge with BlockSyncRequester
mxinden Oct 10, 2019
fd4800d
core/finality-grandpa: Pass BlockSyncRequester to UntilImported
mxinden Oct 10, 2019
0f82795
core/finality-grandpa: Track block number of pending within UntilImpo…
mxinden Oct 10, 2019
a2f6684
core/finality-grandpa: Request block sync on long wait
mxinden Oct 10, 2019
9f9e15f
core/finality-grandpa: Adjust unit tests to previous changes
mxinden Oct 11, 2019
126c35e
core/finality-grandpa: Fix line length
mxinden Oct 11, 2019
72516c0
core/finality-grandpa: Add comment explaining in & out vote combination
mxinden Oct 15, 2019
3b4adca
core/finality-grandpa: Log after, not before, timeout expired
mxinden Oct 17, 2019
74d6637
core/finality-grandpa: Collect senders as HashSet for deduplication
mxinden Oct 18, 2019
c138cfb
Merge remote-tracking branch 'paritytech/master' into sync_request_in…
mxinden Oct 21, 2019
6a1eec8
Revert "core/finality-grandpa: Track senders to maybe later request b…
mxinden Oct 22, 2019
8e7663c
Revert "core/finality-grandpa: Pass Grandpa msg sender up to UntilImp…
mxinden Oct 22, 2019
0805651
core/network/sync: Ask for block from all peers if none provided
mxinden Oct 22, 2019
6fda6a6
core/network/sync: Request specific fork sync from peers ahead or on par
mxinden Oct 23, 2019
2c5422f
Merge remote-tracking branch 'paritytech/master' into sync_request_in…
mxinden Oct 23, 2019
411e101
grandpa: fix tests
andresilva Oct 23, 2019
6d695d1
grandpa: fix warnings
andresilva Oct 23, 2019
202bced
grandpa: add test for block sync request on until_imported
andresilva Oct 23, 2019
284ad34
grandpa: rename Environment field inner to client
andresilva Oct 23, 2019
f030ec6
grandpa: fix minor nits
andresilva Oct 23, 2019
10790e7
grandpa: minor nits in until_imported
andresilva Oct 23, 2019
3705a2c
grandpa: copy docs for set_sync_fork_request
andresilva Oct 23, 2019
d668931
grandpa: remove stale TODO on UntilImported
andresilva Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'paritytech/master' into sync_request_in… 
…_until_imported
  • Loading branch information
@mxinden
mxinden committed Oct 21, 2019
commit c138cfb689ee90dab2cc06f18834587158d00d67
2 changes: 1 addition & 1 deletion core/finality-grandpa/src/environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ impl<Block: BlockT> SharedVoterSetState<Block> {
}

/// The environment we run GRANDPA in.
pub(crate) struct Environment<B, E, Block: BlockT, N: Network<Block>, RA, SC> {
pub(crate) struct Environment<B, E, Block: BlockT, N: Network<Block>, RA, SC, VR> {
// TODO: As far as I can tell this does not follow the pattern of having an outer struct protecting an inner struct
// via a lock in order to be Sync. How about renaming this to `client` like we do in many other places?
Copy link
Contributor

@andresilva andresilva Oct 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, I did the rename.

pub(crate) inner: Arc<Client<B, E, Block, RA>>,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.