From d6ddcb1efee04f30233dbc66b0dcb984f6407908 Mon Sep 17 00:00:00 2001
From: "paritytech-cmd-bot-polkadot-sdk[bot]"
<179002856+paritytech-cmd-bot-polkadot-sdk[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 12:23:33 +0200
Subject: [PATCH] [stable2409] Backport #6031 (#6107)
Backport #6031 into `stable2409` from drewstone.
See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.
<!--
# To be used by other automation, do not modify:
original-pr-number: #${pull_number}
-->
Co-authored-by: drewstone <drewstone329@gmail.com>
---
.../src/justification/verification/equivocation.rs | 2 ++
.../header-chain/src/justification/verification/mod.rs | 2 ++
.../src/justification/verification/optimizer.rs | 2 +-
prdoc/pr_6031.prdoc | 10 ++++++++++
4 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 prdoc/pr_6031.prdoc
diff --git a/bridges/primitives/header-chain/src/justification/verification/equivocation.rs b/bridges/primitives/header-chain/src/justification/verification/equivocation.rs
index fbad301281994..bfcd22f8ca6ad 100644
--- 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
index 9df3511e1035e..9941537eb0953 100644
--- 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
index 3f1e6ab670ca6..5098b594db68f 100644
--- 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
new file mode 100644
index 0000000000000..702d0c12fa064
--- /dev/null
+++ 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