From 87c3a57942681a2aaac24492f88b327e0c1cd98e Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Mon, 17 Oct 2022 11:51:08 +0200
Subject: [PATCH] Removed unused AccountId from `trait MessagesBridge` (#1600)
---
bridges/bin/runtime-common/src/messages.rs | 1 -
bridges/modules/messages/src/lib.rs | 8 ++------
bridges/primitives/messages/src/source_chain.rs | 6 +++---
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/bridges/bin/runtime-common/src/messages.rs b/bridges/bin/runtime-common/src/messages.rs
index 50944826dde..57f3f38cb2e 100644
--- a/bridges/bin/runtime-common/src/messages.rs
+++ b/bridges/bin/runtime-common/src/messages.rs
@@ -532,7 +532,6 @@ pub mod source {
/// Runtime message sender adapter.
type MessageSender: bp_messages::source_chain::MessagesBridge<
OriginOf<ThisChain<Self::MessageBridge>>,
- AccountIdOf<ThisChain<Self::MessageBridge>>,
BalanceOf<ThisChain<Self::MessageBridge>>,
FromThisChainMessagePayload,
>;
diff --git a/bridges/modules/messages/src/lib.rs b/bridges/modules/messages/src/lib.rs
index 0580a0ffdfa..962fd8f7915 100644
--- a/bridges/modules/messages/src/lib.rs
+++ b/bridges/modules/messages/src/lib.rs
@@ -775,12 +775,8 @@ pub mod pallet {
}
impl<T, I>
- bp_messages::source_chain::MessagesBridge<
- T::Origin,
- T::AccountId,
- T::OutboundMessageFee,
- T::OutboundPayload,
- > for Pallet<T, I>
+ bp_messages::source_chain::MessagesBridge<T::Origin, T::OutboundMessageFee, T::OutboundPayload>
+ for Pallet<T, I>
where
T: Config<I>,
I: 'static,
diff --git a/bridges/primitives/messages/src/source_chain.rs b/bridges/primitives/messages/src/source_chain.rs
index 5c6283a8036..70b52dc63aa 100644
--- a/bridges/primitives/messages/src/source_chain.rs
+++ b/bridges/primitives/messages/src/source_chain.rs
@@ -182,7 +182,7 @@ pub struct SendMessageArtifacts {
}
/// Messages bridge API to be used from other pallets.
-pub trait MessagesBridge<SenderOrigin, AccountId, Balance, Payload> {
+pub trait MessagesBridge<SenderOrigin, Balance, Payload> {
/// Error type.
type Error: Debug;
@@ -201,8 +201,8 @@ pub trait MessagesBridge<SenderOrigin, AccountId, Balance, Payload> {
#[derive(Eq, RuntimeDebug, PartialEq)]
pub struct NoopMessagesBridge;
-impl<SenderOrigin, AccountId, Balance, Payload>
- MessagesBridge<SenderOrigin, AccountId, Balance, Payload> for NoopMessagesBridge
+impl<SenderOrigin, Balance, Payload> MessagesBridge<SenderOrigin, Balance, Payload>
+ for NoopMessagesBridge
{
type Error = &'static str;
--
GitLab