Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prospective-parachains rework: take II #4937

Merged
merged 64 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
8362d1e
first prototype
alindima Jun 26, 2024
d634867
first prototype part 2
alindima Jun 28, 2024
ded4ee9
first sane version
alindima Jul 1, 2024
53f9327
some more code
alindima Jul 2, 2024
67d6887
bugfixes
alindima Jul 3, 2024
7a59fcf
add doc comments to HypotheticalOrConcreteCandidate
alindima Jul 3, 2024
33f239e
fix compilation
alindima Jul 4, 2024
ac9285e
some minor refactors
alindima Jul 4, 2024
2b58595
mostly cosmetics
alindima Jul 4, 2024
ce00024
Merge remote-tracking branch 'origin/master' into alindima/prospectiv…
alindima Jul 4, 2024
dfba945
Merge remote-tracking branch 'origin/master' into alindima/prospectiv…
alindima Jul 5, 2024
e34de0e
start updating comments
alindima Jul 5, 2024
2993cd7
more comments
alindima Jul 5, 2024
a8ee808
update inclusion emulator docs
alindima Jul 9, 2024
49634ea
metrics
alindima Jul 9, 2024
2ab16a8
rename chain to best_chain and group it in a struct for better readab…
alindima Jul 9, 2024
fdd8e54
nits
alindima Jul 9, 2024
297781b
start modifying tests
alindima Jul 11, 2024
386273e
some unit tests
alindima Jul 12, 2024
3c0d7d8
Merge remote-tracking branch 'origin/master' into alindima/prospectiv…
alindima Jul 24, 2024
a56f371
more unit tests
alindima Jul 24, 2024
cb91a20
typos
alindima Jul 24, 2024
1f1fde5
unit test for ForkWithCandidatePendingAvailability
alindima Jul 24, 2024
1a07e56
update lock
alindima Jul 24, 2024
eae9345
fmt
alindima Jul 24, 2024
27dd91d
don't keep candidates from previous leaf if they used to be pending a…
alindima Jul 25, 2024
b691b86
more tests
alindima Jul 25, 2024
b13c536
unit tests for backable chain
alindima Jul 25, 2024
45b4133
move wild import
alindima Jul 25, 2024
2cbc770
Merge remote-tracking branch 'origin/master' into alindima/prospectiv…
alindima Jul 25, 2024
6b10a11
add rand dependency
alindima Jul 25, 2024
a81f149
small refactor
alindima Jul 26, 2024
dedfd68
more unit testing
alindima Jul 26, 2024
a83d78f
Merge remote-tracking branch 'origin/master' into alindima/prospectiv…
alindima Jul 29, 2024
d758d14
unit testing
alindima Jul 29, 2024
8858f36
remove unused deps
alindima Jul 30, 2024
b2612e9
finish up tests
alindima Jul 30, 2024
3443af1
add prdoc
alindima Jul 31, 2024
4b975cb
rollback CI yaml changes
alindima Jul 31, 2024
e4dd399
correct log
alindima Aug 1, 2024
d43f024
fix another log
alindima Aug 1, 2024
10e3425
remove CandidateAlreadyPendingAvailability error variant
alindima Aug 1, 2024
e9da176
fix verbose log
alindima Aug 2, 2024
0c5f6c3
fix bug with relay chain forks not getting the candidates from the pr…
alindima Aug 2, 2024
90b6983
log active leaf updates
alindima Aug 2, 2024
797e9b6
add test for bugfix
alindima Aug 2, 2024
b5eaf54
use backing implicit view in prospective-parachains
alindima Aug 5, 2024
e54566f
Merge remote-tracking branch 'origin/master' into alindima/prospectiv…
alindima Aug 7, 2024
5166663
update some comments
alindima Aug 7, 2024
9a4b88d
address some comments
alindima Aug 7, 2024
4ba7b0f
a bit of refactoring
alindima Aug 7, 2024
021515e
optimise candidate_backed
alindima Aug 7, 2024
a9c5799
move public items to the top of the impl blocks
alindima Aug 8, 2024
243466f
remove comment
alindima Aug 8, 2024
78cf31a
refactor fragment chain constructor and acitve leave update handling
alindima Aug 8, 2024
0243915
restrict the visibility of some items
alindima Aug 8, 2024
034706e
dedup into a From impl
alindima Aug 8, 2024
09eb5ee
update prdoc
alindima Aug 8, 2024
80e52cb
Merge remote-tracking branch 'origin/master' into alindima/prospectiv…
alindima Aug 8, 2024
64546fe
update some comments
alindima Aug 9, 2024
1c31af0
address a todo
alindima Aug 9, 2024
142432d
keep tracking candidates for deactivated leaves in implicit view
alindima Aug 9, 2024
a9d7131
add test for bounded implicit view
alindima Aug 9, 2024
32b2ebf
Merge remote-tracking branch 'origin/master' into alindima/prospectiv…
alindima Aug 9, 2024
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
2 changes: 1 addition & 1 deletion .gitlab/pipeline/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cargo-clippy:
extends:
- .docker-env
- .common-refs
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
variables:
RUSTFLAGS: "-D warnings"
script:
Expand Down
18 changes: 9 additions & 9 deletions .gitlab/pipeline/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ codecov-start:
extends:
- .kubernetes-env
- .common-refs
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
- .run-immediately
script:
- !reference [.codecov-check, script]
Expand All @@ -53,7 +53,7 @@ codecov-finish:
extends:
- .kubernetes-env
- .common-refs
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
needs:
- test-linux-stable-codecov
script:
Expand All @@ -72,7 +72,7 @@ test-linux-stable-codecov:
extends:
- .docker-env
- .common-refs
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
variables:
CI_IMAGE: europe-docker.pkg.dev/parity-build/ci-images/ci-unified:bullseye-1.77.0
RUST_TOOLCHAIN: stable
Expand Down Expand Up @@ -118,7 +118,7 @@ test-linux-stable:
- .docker-env
- .common-refs
- .run-immediately
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
variables:
RUST_TOOLCHAIN: stable
# Enable debug assertions since we are running optimized builds for testing
Expand Down Expand Up @@ -167,7 +167,7 @@ test-linux-stable-runtime-benchmarks:
- .docker-env
- .common-refs
- .run-immediately
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
variables:
RUST_TOOLCHAIN: stable
# Enable debug assertions since we are running optimized builds for testing
Expand Down Expand Up @@ -303,7 +303,7 @@ cargo-check-benches:
- .common-refs
- .run-immediately
- .collect-artifacts
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
before_script:
# TODO: DON'T FORGET TO CHANGE FOR PROD VALUES!!!
# merges in the master branch on PRs. skip if base is not master
Expand Down Expand Up @@ -463,7 +463,7 @@ test-linux-stable-int:
- .docker-env
- .common-refs
- .run-immediately
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
variables:
# Enable debug assertions since we are running optimized builds for testing
# but still want to have debug assertions.
Expand All @@ -485,7 +485,7 @@ check-tracing:
- .docker-env
- .common-refs
- .run-immediately
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
script:
# with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases
- time cargo test --locked --manifest-path ./substrate/primitives/tracing/Cargo.toml --no-default-features
Expand All @@ -498,7 +498,7 @@ check-metadata-hash:
- .docker-env
- .common-refs
- .run-immediately
- .pipeline-stopper-artifacts
# - .pipeline-stopper-artifacts
script:
- time cargo build --locked -p westend-runtime --features metadata-hash

Expand Down
15 changes: 0 additions & 15 deletions polkadot/node/core/prospective-parachains/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,6 @@ use fatality::Nested;
#[allow(missing_docs)]
#[fatality::fatality(splitable)]
pub enum Error {
#[fatal]
#[error("SubsystemError::Context error: {0}")]
SubsystemContext(String),

#[fatal]
#[error("Spawning a task failed: {0}")]
SpawnFailed(SubsystemError),

#[fatal]
#[error("Participation worker receiver exhausted.")]
ParticipationWorkerReceiverExhausted,

#[fatal]
#[error("Receiving message from overseer failed: {0}")]
SubsystemReceive(#[source] SubsystemError),
Expand All @@ -55,9 +43,6 @@ pub enum Error {
#[error(transparent)]
ChainApi(#[from] ChainApiError),

#[error(transparent)]
Subsystem(SubsystemError),

#[error("Request to chain API subsystem dropped")]
ChainApiRequestCanceled(oneshot::Canceled),

Expand Down
Loading
Loading