This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Conversation
This reverts commit 42fbca6.
coriolinus
added
A6-revertrevert
B0-silent
tomaka
approved these changes
Sep 28, 2020
Contributor
|
bot merge |
|
Trying merge. |
ghost
merged commit
ordian
added a commit
that referenced
this pull request
Sep 28, 2020
* master: Collator protocol followup (#1741) Revert "Remove Old Service, 2nd try (#1732)" (#1758) Remove Old Service, 2nd try (#1732) collation-generation: guide and tidying (#1753) Companion for #7111 (Introduce `cancel_proposal` and `blacklist`) (#1728) Parachains: Introduce a dummy module to include the Origin. (#1749) provisioner tests: remove tokio from dev-dependencies (#1745)
coriolinus
added a commit
that referenced
this pull request
Oct 2, 2020
i.e. Revert "Revert "Remove Old Service, 2nd try (#1732)" (#1758)" This reverts commit c80f7b6. Closes #1757. We now have some evidence that the polkadot validator was producing blocks after all; the reason the blocks_constructed metric was 0 was that as a new metric it hadn't yet been incorporated into that branch's codebase. See #1757 (comment) As this PR is based on a newer `master` branch than the previous one, that should hopefully no longer be an issue.
coriolinus
added a commit
that referenced
this pull request
Oct 8, 2020
* Remove old service, 3rd try i.e. Revert "Revert "Remove Old Service, 2nd try (#1732)" (#1758)" This reverts commit c80f7b6. Closes #1757. We now have some evidence that the polkadot validator was producing blocks after all; the reason the blocks_constructed metric was 0 was that as a new metric it hadn't yet been incorporated into that branch's codebase. See #1757 (comment) As this PR is based on a newer `master` branch than the previous one, that should hopefully no longer be an issue. * paras trait now has an Origin type * initial work running a two node local net * use the right incantations so the nodes produce blocks together * improve internal documentation Co-authored-by: Bastian Köcher <git@kchr.de>
This pull request was closed.
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Reverts #1732 due to #1757.
This is, irritatingly, the second reversion of this set of changes. Still, better to get it right.