Skip to content

Commit 00c2c1e

Browse files
alindimaalindima
committed
fix candidate-validation tests
1 parent 51fac29 commit 00c2c1e

File tree

1 file changed

+42
-5
lines changed
  • polkadot/node/core/candidate-validation/src

1 file changed

+42
-5
lines changed

‎polkadot/node/core/candidate-validation/src/tests.rs

+42-5
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ use polkadot_node_subsystem_util::reexports::SubsystemContext;
3131
use polkadot_overseer::ActivatedLeaf;
3232
use polkadot_primitives::{
3333
vstaging::{
34-
CandidateDescriptorV2, CandidateDescriptorVersion, ClaimQueueOffset, CoreSelector,
35-
MutateDescriptorV2, UMPSignal, UMP_SEPARATOR,
34+
CandidateDescriptorV2, CandidateDescriptorVersion, ClaimQueueOffset,
35+
CommittedCandidateReceiptError, CoreSelector, MutateDescriptorV2, UMPSignal, UMP_SEPARATOR,
3636
},
3737
CandidateDescriptor, CoreIndex, GroupIndex, HeadData, Id as ParaId, OccupiedCoreAssumption,
3838
SessionInfo, UpwardMessage, ValidatorId, DEFAULT_SCHEDULING_LOOKAHEAD,
@@ -531,6 +531,7 @@ fn session_index_checked_only_in_backing() {
531531
&Default::default(),
532532
Default::default(),
533533
VALIDATION_CODE_BOMB_LIMIT,
534+
Default::default(),
534535
))
535536
.unwrap();
536537

@@ -549,6 +550,7 @@ fn session_index_checked_only_in_backing() {
549550
&Default::default(),
550551
Default::default(),
551552
VALIDATION_CODE_BOMB_LIMIT,
553+
Default::default(),
552554
))
553555
.unwrap();
554556

@@ -574,6 +576,7 @@ fn session_index_checked_only_in_backing() {
574576
&Default::default(),
575577
Default::default(),
576578
VALIDATION_CODE_BOMB_LIMIT,
579+
Default::default(),
577580
))
578581
.unwrap();
579582

@@ -673,6 +676,7 @@ fn candidate_validation_ok_is_ok(#[case] v2_descriptor: bool) {
673676
&Default::default(),
674677
Some(ClaimQueueSnapshot(cq)),
675678
VALIDATION_CODE_BOMB_LIMIT,
679+
Some(Default::default()),
676680
))
677681
.unwrap();
678682

@@ -752,6 +756,7 @@ fn invalid_session_or_core_index() {
752756
&Default::default(),
753757
Default::default(),
754758
VALIDATION_CODE_BOMB_LIMIT,
759+
Some(Default::default()),
755760
))
756761
.unwrap();
757762

@@ -769,6 +774,7 @@ fn invalid_session_or_core_index() {
769774
&Default::default(),
770775
Default::default(),
771776
VALIDATION_CODE_BOMB_LIMIT,
777+
Some(Default::default()),
772778
))
773779
.unwrap();
774780

@@ -788,9 +794,15 @@ fn invalid_session_or_core_index() {
788794
&Default::default(),
789795
Some(Default::default()),
790796
VALIDATION_CODE_BOMB_LIMIT,
797+
Some(Default::default()),
791798
))
792799
.unwrap();
793-
assert_matches!(result, ValidationResult::Invalid(InvalidCandidate::InvalidCoreIndex));
800+
assert_matches!(
801+
result,
802+
ValidationResult::Invalid(InvalidCandidate::InvalidUMPSignals(
803+
CommittedCandidateReceiptError::NoAssignment
804+
))
805+
);
794806

795807
let result = executor::block_on(validate_candidate_exhaustive(
796808
1,
@@ -804,9 +816,15 @@ fn invalid_session_or_core_index() {
804816
&Default::default(),
805817
Some(Default::default()),
806818
VALIDATION_CODE_BOMB_LIMIT,
819+
Some(Default::default()),
807820
))
808821
.unwrap();
809-
assert_matches!(result, ValidationResult::Invalid(InvalidCandidate::InvalidCoreIndex));
822+
assert_matches!(
823+
result,
824+
ValidationResult::Invalid(InvalidCandidate::InvalidUMPSignals(
825+
CommittedCandidateReceiptError::NoAssignment
826+
))
827+
);
810828

811829
let v = executor::block_on(validate_candidate_exhaustive(
812830
1,
@@ -820,6 +838,7 @@ fn invalid_session_or_core_index() {
820838
&Default::default(),
821839
Default::default(),
822840
VALIDATION_CODE_BOMB_LIMIT,
841+
Default::default(),
823842
))
824843
.unwrap();
825844

@@ -846,6 +865,7 @@ fn invalid_session_or_core_index() {
846865
&Default::default(),
847866
Default::default(),
848867
VALIDATION_CODE_BOMB_LIMIT,
868+
Default::default(),
849869
))
850870
.unwrap();
851871

@@ -876,6 +896,7 @@ fn invalid_session_or_core_index() {
876896
&Default::default(),
877897
Some(ClaimQueueSnapshot(cq.clone())),
878898
VALIDATION_CODE_BOMB_LIMIT,
899+
Some(Default::default()),
879900
))
880901
.unwrap();
881902

@@ -900,6 +921,7 @@ fn invalid_session_or_core_index() {
900921
&Default::default(),
901922
Some(ClaimQueueSnapshot(cq)),
902923
VALIDATION_CODE_BOMB_LIMIT,
924+
Some(Default::default()),
903925
))
904926
.unwrap();
905927

@@ -945,9 +967,15 @@ fn invalid_session_or_core_index() {
945967
&Default::default(),
946968
Some(Default::default()),
947969
VALIDATION_CODE_BOMB_LIMIT,
970+
Some(Default::default()),
948971
))
949972
.unwrap();
950-
assert_matches!(result, ValidationResult::Invalid(InvalidCandidate::InvalidCoreIndex));
973+
assert_matches!(
974+
result,
975+
ValidationResult::Invalid(InvalidCandidate::InvalidUMPSignals(
976+
CommittedCandidateReceiptError::UMPSignalWithV1Decriptor
977+
))
978+
);
951979
}
952980

953981
// Validation doesn't fail for approvals and disputes, core/session index is not checked.
@@ -964,6 +992,7 @@ fn invalid_session_or_core_index() {
964992
&Default::default(),
965993
Default::default(),
966994
VALIDATION_CODE_BOMB_LIMIT,
995+
Default::default(),
967996
))
968997
.unwrap();
969998

@@ -1021,6 +1050,7 @@ fn candidate_validation_bad_return_is_invalid() {
10211050
&Default::default(),
10221051
Default::default(),
10231052
VALIDATION_CODE_BOMB_LIMIT,
1053+
Default::default(),
10241054
))
10251055
.unwrap();
10261056

@@ -1106,6 +1136,7 @@ fn candidate_validation_one_ambiguous_error_is_valid() {
11061136
&Default::default(),
11071137
Default::default(),
11081138
VALIDATION_CODE_BOMB_LIMIT,
1139+
Default::default(),
11091140
))
11101141
.unwrap();
11111142

@@ -1150,6 +1181,7 @@ fn candidate_validation_multiple_ambiguous_errors_is_invalid() {
11501181
&Default::default(),
11511182
Default::default(),
11521183
VALIDATION_CODE_BOMB_LIMIT,
1184+
Default::default(),
11531185
))
11541186
.unwrap();
11551187

@@ -1268,6 +1300,7 @@ fn candidate_validation_retry_on_error_helper(
12681300
&Default::default(),
12691301
Default::default(),
12701302
VALIDATION_CODE_BOMB_LIMIT,
1303+
Default::default(),
12711304
))
12721305
}
12731306

@@ -1314,6 +1347,7 @@ fn candidate_validation_timeout_is_internal_error() {
13141347
&Default::default(),
13151348
Default::default(),
13161349
VALIDATION_CODE_BOMB_LIMIT,
1350+
Default::default(),
13171351
));
13181352

13191353
assert_matches!(v, Ok(ValidationResult::Invalid(InvalidCandidate::Timeout)));
@@ -1364,6 +1398,7 @@ fn candidate_validation_commitment_hash_mismatch_is_invalid() {
13641398
&Default::default(),
13651399
Default::default(),
13661400
VALIDATION_CODE_BOMB_LIMIT,
1401+
Default::default(),
13671402
))
13681403
.unwrap();
13691404

@@ -1417,6 +1452,7 @@ fn candidate_validation_code_mismatch_is_invalid() {
14171452
&Default::default(),
14181453
Default::default(),
14191454
VALIDATION_CODE_BOMB_LIMIT,
1455+
Default::default(),
14201456
))
14211457
.unwrap();
14221458

@@ -1479,6 +1515,7 @@ fn compressed_code_works() {
14791515
&Default::default(),
14801516
Some(Default::default()),
14811517
VALIDATION_CODE_BOMB_LIMIT,
1518+
Some(Default::default()),
14821519
));
14831520

14841521
assert_matches!(v, Ok(ValidationResult::Valid(_, _)));

0 commit comments

Comments
 (0)