Skip to content
Snippets Groups Projects
Unverified Commit c4aa2ab6 authored by Branislav Kontur's avatar Branislav Kontur Committed by GitHub
Browse files

Hide `tuplex` dependency and re-export by macro (#4774)


Addressing comment:
https://github.com/paritytech/polkadot-sdk/pull/4102/files#r1635502496

---------

Co-authored-by: default avatarOliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
parent ad862092
No related merge requests found
Pipeline #480924 waiting for manual action with stages
in 2 hours, 17 minutes, and 13 seconds
......@@ -2101,7 +2101,6 @@ dependencies = [
"static_assertions",
"substrate-wasm-builder",
"testnet-parachains-constants",
"tuplex",
"xcm-fee-payment-runtime-api",
]
......@@ -2261,7 +2260,6 @@ dependencies = [
"static_assertions",
"substrate-wasm-builder",
"testnet-parachains-constants",
"tuplex",
"westend-runtime-constants",
"xcm-fee-payment-runtime-api",
]
......
......@@ -36,6 +36,12 @@ use sp_runtime::{
transaction_validity::{TransactionPriority, TransactionValidity, ValidTransactionBuilder},
};
// Re-export to avoid include tuplex dependency everywhere.
#[doc(hidden)]
pub mod __private {
pub use tuplex;
}
/// A duplication of the `FilterCall` trait.
///
/// We need this trait in order to be able to implement it for the messages pallet,
......@@ -313,7 +319,7 @@ macro_rules! generate_bridge_reject_obsolete_headers_and_messages {
info: &sp_runtime::traits::DispatchInfoOf<Self::Call>,
len: usize,
) -> Result<Self::Pre, sp_runtime::transaction_validity::TransactionValidityError> {
use tuplex::PushBack;
use $crate::extensions::check_obsolete_extension::__private::tuplex::PushBack;
let to_post_dispatch = ();
$(
let (from_validate, call_filter_validity) = <
......@@ -336,7 +342,7 @@ macro_rules! generate_bridge_reject_obsolete_headers_and_messages {
len: usize,
result: &sp_runtime::DispatchResult,
) -> Result<(), sp_runtime::transaction_validity::TransactionValidityError> {
use tuplex::PopFront;
use $crate::extensions::check_obsolete_extension::__private::tuplex::PopFront;
let Some((relayer, to_post_dispatch)) = to_post_dispatch else { return Ok(()) };
let has_failed = result.is_err();
$(
......
......@@ -22,7 +22,6 @@ scale-info = { version = "2.11.1", default-features = false, features = [
"derive",
] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
tuplex = { version = "0.1", default-features = false }
# Substrate
frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
......@@ -218,7 +217,6 @@ std = [
"sp-version/std",
"substrate-wasm-builder",
"testnet-parachains-constants/std",
"tuplex/std",
"xcm-builder/std",
"xcm-executor/std",
"xcm-fee-payment-runtime-api/std",
......
......@@ -18,7 +18,6 @@ hex-literal = { version = "0.4.1" }
log = { workspace = true }
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
tuplex = { version = "0.1", default-features = false }
# Substrate
frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
......@@ -182,7 +181,6 @@ std = [
"sp-version/std",
"substrate-wasm-builder",
"testnet-parachains-constants/std",
"tuplex/std",
"westend-runtime-constants/std",
"xcm-builder/std",
"xcm-executor/std",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment