From ee875bfaa7a006f8eaccbe279193c5e21a9e3051 Mon Sep 17 00:00:00 2001 From: eskimor Date: Sat, 30 Nov 2024 00:31:27 +0100 Subject: [PATCH 1/4] BACKPORT-CONFLICT --- polkadot/node/network/collator-protocol/src/error.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/polkadot/node/network/collator-protocol/src/error.rs b/polkadot/node/network/collator-protocol/src/error.rs index 0f5e0699d85c0..271448915ea97 100644 --- a/polkadot/node/network/collator-protocol/src/error.rs +++ b/polkadot/node/network/collator-protocol/src/error.rs @@ -102,7 +102,15 @@ impl SecondingError { self, PersistedValidationDataMismatch | CandidateHashMismatch | +<<<<<<< HEAD Duplicate | ParentHeadDataMismatch +======= + RelayParentMismatch | + ParentHeadDataMismatch | + InvalidCoreIndex(_, _) | + InvalidSessionIndex(_, _) | + InvalidReceiptVersion(_) +>>>>>>> 5e0bcb0 (Let's be a bit less strict here. (#6662)) ) } } From eb4962b8be4b4db0cc7eef488b07a0785ddcb487 Mon Sep 17 00:00:00 2001 From: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Date: Mon, 9 Dec 2024 18:01:03 +0200 Subject: [PATCH 2/4] Update error.rs --- polkadot/node/network/collator-protocol/src/error.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/polkadot/node/network/collator-protocol/src/error.rs b/polkadot/node/network/collator-protocol/src/error.rs index 271448915ea97..a0785b135a624 100644 --- a/polkadot/node/network/collator-protocol/src/error.rs +++ b/polkadot/node/network/collator-protocol/src/error.rs @@ -102,15 +102,11 @@ impl SecondingError { self, PersistedValidationDataMismatch | CandidateHashMismatch | -<<<<<<< HEAD - Duplicate | ParentHeadDataMismatch -======= RelayParentMismatch | ParentHeadDataMismatch | InvalidCoreIndex(_, _) | InvalidSessionIndex(_, _) | InvalidReceiptVersion(_) ->>>>>>> 5e0bcb0 (Let's be a bit less strict here. (#6662)) ) } } From a90f28abe9cd87e05bdb43607361d22732af786e Mon Sep 17 00:00:00 2001 From: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Date: Mon, 9 Dec 2024 18:06:22 +0200 Subject: [PATCH 3/4] Update error.rs --- polkadot/node/network/collator-protocol/src/error.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/polkadot/node/network/collator-protocol/src/error.rs b/polkadot/node/network/collator-protocol/src/error.rs index a0785b135a624..285bff5f5c441 100644 --- a/polkadot/node/network/collator-protocol/src/error.rs +++ b/polkadot/node/network/collator-protocol/src/error.rs @@ -103,10 +103,7 @@ impl SecondingError { PersistedValidationDataMismatch | CandidateHashMismatch | RelayParentMismatch | - ParentHeadDataMismatch | - InvalidCoreIndex(_, _) | - InvalidSessionIndex(_, _) | - InvalidReceiptVersion(_) + ParentHeadDataMismatch ) } } From 2607232b238f358051f1b9006a87e6018db2777e Mon Sep 17 00:00:00 2001 From: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Date: Mon, 9 Dec 2024 18:09:22 +0200 Subject: [PATCH 4/4] Update error.rs --- polkadot/node/network/collator-protocol/src/error.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/polkadot/node/network/collator-protocol/src/error.rs b/polkadot/node/network/collator-protocol/src/error.rs index 285bff5f5c441..bc39656c2ff4b 100644 --- a/polkadot/node/network/collator-protocol/src/error.rs +++ b/polkadot/node/network/collator-protocol/src/error.rs @@ -102,7 +102,6 @@ impl SecondingError { self, PersistedValidationDataMismatch | CandidateHashMismatch | - RelayParentMismatch | ParentHeadDataMismatch ) }