remove account derivation functions (#1498)

This commit is contained in:
Svyatoslav Nikolsky
2022-07-12 11:07:38 +03:00
committed by Bastian Köcher
parent d327b25724
commit ceefd1b05d
22 changed files with 6 additions and 327 deletions
@@ -15,7 +15,6 @@
// along with Parity Bridges Common. If not, see <http://www.gnu.org/licenses/>.
use crate::cli::CliChain;
use bp_runtime::{AccountIdOf, SourceAccount};
use relay_substrate_client::{AccountKeyPairOf, Chain, TransactionSignScheme};
use strum::{EnumString, EnumVariantNames};
use substrate_relay_helper::{
@@ -82,11 +81,6 @@ pub trait MessagesCliBridge: CliBridgeBase {
SourceTransactionSignScheme = Self::Source,
TargetTransactionSignScheme = Self::Target,
>;
/// We use this to get the account on the target which is derived from the source account.
fn derive_account_from_id(
id: SourceAccount<AccountIdOf<Self::Source>>,
) -> AccountIdOf<Self::Target>;
}
//// `Millau` to `Rialto` bridge definition.
@@ -105,12 +99,6 @@ impl MessagesCliBridge for MillauToRialtoCliBridge {
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
bp_rialto::TO_RIALTO_ESTIMATE_MESSAGE_FEE_METHOD;
type MessagesLane = crate::chains::millau_messages_to_rialto::MillauMessagesToRialto;
fn derive_account_from_id(
id: SourceAccount<AccountIdOf<Self::Source>>,
) -> AccountIdOf<Self::Target> {
bp_rialto::derive_account_from_millau_id(id)
}
}
//// `Rialto` to `Millau` bridge definition.
@@ -129,14 +117,6 @@ impl MessagesCliBridge for RialtoToMillauCliBridge {
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
bp_millau::TO_MILLAU_ESTIMATE_MESSAGE_FEE_METHOD;
type MessagesLane = crate::chains::rialto_messages_to_millau::RialtoMessagesToMillau;
/// We use this to get the account on the target chain which is derived from
/// the source chain account.
fn derive_account_from_id(
id: SourceAccount<AccountIdOf<Self::Source>>,
) -> AccountIdOf<Self::Target> {
bp_millau::derive_account_from_rialto_id(id)
}
}
//// `Westend` to `Millau` bridge definition.
@@ -169,12 +149,6 @@ impl MessagesCliBridge for MillauToRialtoParachainCliBridge {
bp_rialto_parachain::TO_RIALTO_PARACHAIN_ESTIMATE_MESSAGE_FEE_METHOD;
type MessagesLane =
crate::chains::millau_messages_to_rialto_parachain::MillauMessagesToRialtoParachain;
fn derive_account_from_id(
id: SourceAccount<AccountIdOf<Self::Source>>,
) -> AccountIdOf<Self::Target> {
bp_rialto_parachain::derive_account_from_millau_id(id)
}
}
//// `RialtoParachain` to `Millau` bridge definition.
@@ -190,12 +164,6 @@ impl MessagesCliBridge for RialtoParachainToMillauCliBridge {
bp_millau::TO_MILLAU_ESTIMATE_MESSAGE_FEE_METHOD;
type MessagesLane =
crate::chains::rialto_parachain_messages_to_millau::RialtoParachainMessagesToMillau;
fn derive_account_from_id(
id: SourceAccount<AccountIdOf<Self::Source>>,
) -> AccountIdOf<Self::Target> {
bp_millau::derive_account_from_rialto_parachain_id(id)
}
}
//// `WestendParachain` to `Millau` bridge definition.