Merge branch 'stable2407' into backport-6080-to-stable2407

paritytech · Dec 4, 2024 · b6680e1 · b6680e1
2 parents 4f9c488 + 5405cdc
commit b6680e1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/bridges/primitives/header-chain/src/justification/verification/equivocation.rs b/bridges/primitives/header-chain/src/justification/verification/equivocation.rs
@@ -34,6 +34,8 @@ use sp_runtime::traits::Header as HeaderT;
 use sp_std::{
 	collections::{btree_map::BTreeMap, btree_set::BTreeSet},
 	prelude::*,
+	vec,
+	vec::Vec,
 };
 
 enum AuthorityVotes<Header: HeaderT> {

diff --git a/bridges/primitives/header-chain/src/justification/verification/mod.rs b/bridges/primitives/header-chain/src/justification/verification/mod.rs
@@ -35,6 +35,8 @@ use sp_std::{
 		btree_set::BTreeSet,
 	},
 	prelude::*,
+	vec,
+	vec::Vec,
 };
 
 type SignedPrecommit<Header> = finality_grandpa::SignedPrecommit<

diff --git a/bridges/primitives/header-chain/src/justification/verification/optimizer.rs b/bridges/primitives/header-chain/src/justification/verification/optimizer.rs
@@ -26,7 +26,7 @@ use crate::justification::verification::{
 };
 use sp_consensus_grandpa::AuthorityId;
 use sp_runtime::traits::Header as HeaderT;
-use sp_std::{collections::btree_set::BTreeSet, prelude::*};
+use sp_std::{collections::btree_set::BTreeSet, prelude::*, vec, vec::Vec};
 
 // Verification callbacks for justification optimization.
 struct JustificationOptimizer<Header: HeaderT> {

diff --git a/prdoc/pr_6031.prdoc b/prdoc/pr_6031.prdoc
@@ -0,0 +1,10 @@
+title: "Import vec to bridges/primitives/header-chain"
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Add the `vec` dependency to these files to resolve compiler errors.
+
+crates:
+  - name: bp-header-chain
+    bump: patch