From 733c729c3e7101050aa9e359610f6b03d3d41fe3 Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Mon, 3 Oct 2022 16:54:47 +0200
Subject: [PATCH 1/2] LaneMessageVerifier - removed unused Submitter

---
 bin/runtime-common/src/messages.rs      | 1 -
 modules/messages/src/lib.rs             | 1 -
 modules/messages/src/mock.rs            | 2 +-
 primitives/messages/src/source_chain.rs | 6 +++---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bin/runtime-common/src/messages.rs b/bin/runtime-common/src/messages.rs
index a7ad19dc1f..50944826dd 100644
--- a/bin/runtime-common/src/messages.rs
+++ b/bin/runtime-common/src/messages.rs
@@ -315,7 +315,6 @@ pub mod source {
 	impl<B>
 		LaneMessageVerifier<
 			OriginOf<ThisChain<B>>,
-			AccountIdOf<ThisChain<B>>,
 			FromThisChainMessagePayload,
 			BalanceOf<ThisChain<B>>,
 		> for FromThisChainMessageVerifier<B>
diff --git a/modules/messages/src/lib.rs b/modules/messages/src/lib.rs
index c2e4dce9b2..0580a0ffdf 100644
--- a/modules/messages/src/lib.rs
+++ b/modules/messages/src/lib.rs
@@ -175,7 +175,6 @@ pub mod pallet {
 		/// Message payload verifier.
 		type LaneMessageVerifier: LaneMessageVerifier<
 			Self::Origin,
-			Self::AccountId,
 			Self::OutboundPayload,
 			Self::OutboundMessageFee,
 		>;
diff --git a/modules/messages/src/mock.rs b/modules/messages/src/mock.rs
index 9584d17b83..f41fc214b8 100644
--- a/modules/messages/src/mock.rs
+++ b/modules/messages/src/mock.rs
@@ -298,7 +298,7 @@ impl TargetHeaderChain<TestPayload, TestRelayer> for TestTargetHeaderChain {
 #[derive(Debug, Default)]
 pub struct TestLaneMessageVerifier;
 
-impl LaneMessageVerifier<Origin, AccountId, TestPayload, TestMessageFee>
+impl LaneMessageVerifier<Origin, TestPayload, TestMessageFee>
 	for TestLaneMessageVerifier
 {
 	type Error = &'static str;
diff --git a/primitives/messages/src/source_chain.rs b/primitives/messages/src/source_chain.rs
index be56ffe87f..bd1c3ea930 100644
--- a/primitives/messages/src/source_chain.rs
+++ b/primitives/messages/src/source_chain.rs
@@ -96,7 +96,7 @@ pub trait TargetHeaderChain<Payload, AccountId> {
 /// Lane3 until some block, ...), then it may be built using this verifier.
 ///
 /// Any fee requirements should also be enforced here.
-pub trait LaneMessageVerifier<SenderOrigin, Submitter, Payload, Fee> {
+pub trait LaneMessageVerifier<SenderOrigin, Payload, Fee> {
 	/// Error type.
 	type Error: Debug + Into<&'static str>;
 
@@ -278,8 +278,8 @@ impl<Payload, AccountId> TargetHeaderChain<Payload, AccountId> for ForbidOutboun
 	}
 }
 
-impl<SenderOrigin, Submitter, Payload, Fee>
-	LaneMessageVerifier<SenderOrigin, Submitter, Payload, Fee> for ForbidOutboundMessages
+impl<SenderOrigin, Payload, Fee>
+	LaneMessageVerifier<SenderOrigin, Payload, Fee> for ForbidOutboundMessages
 {
 	type Error = &'static str;
 

From 4274e209d60850d6cabfe61fc94904f810606c11 Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Mon, 3 Oct 2022 17:10:42 +0200
Subject: [PATCH 2/2] fmt

---
 modules/messages/src/mock.rs            | 4 +---
 primitives/messages/src/source_chain.rs | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/messages/src/mock.rs b/modules/messages/src/mock.rs
index f41fc214b8..41ae0352cf 100644
--- a/modules/messages/src/mock.rs
+++ b/modules/messages/src/mock.rs
@@ -298,9 +298,7 @@ impl TargetHeaderChain<TestPayload, TestRelayer> for TestTargetHeaderChain {
 #[derive(Debug, Default)]
 pub struct TestLaneMessageVerifier;
 
-impl LaneMessageVerifier<Origin, TestPayload, TestMessageFee>
-	for TestLaneMessageVerifier
-{
+impl LaneMessageVerifier<Origin, TestPayload, TestMessageFee> for TestLaneMessageVerifier {
 	type Error = &'static str;
 
 	fn verify_message(
diff --git a/primitives/messages/src/source_chain.rs b/primitives/messages/src/source_chain.rs
index bd1c3ea930..c03d303ee8 100644
--- a/primitives/messages/src/source_chain.rs
+++ b/primitives/messages/src/source_chain.rs
@@ -278,8 +278,8 @@ impl<Payload, AccountId> TargetHeaderChain<Payload, AccountId> for ForbidOutboun
 	}
 }
 
-impl<SenderOrigin, Payload, Fee>
-	LaneMessageVerifier<SenderOrigin, Payload, Fee> for ForbidOutboundMessages
+impl<SenderOrigin, Payload, Fee> LaneMessageVerifier<SenderOrigin, Payload, Fee>
+	for ForbidOutboundMessages
 {
 	type Error = &'static str;