From 32342bf6e556642a8b6c0f561f5d35e6919fa121 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 15 Feb 2021 15:11:17 +0300 Subject: [PATCH] remove lower limit of message weight (#727) --- bridges/bin/millau/runtime/src/rialto_messages.rs | 13 ++++++------- bridges/bin/rialto/runtime/src/millau_messages.rs | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/bridges/bin/millau/runtime/src/rialto_messages.rs b/bridges/bin/millau/runtime/src/rialto_messages.rs index caec651f70..1ba7f8361f 100644 --- a/bridges/bin/millau/runtime/src/rialto_messages.rs +++ b/bridges/bin/millau/runtime/src/rialto_messages.rs @@ -95,17 +95,16 @@ impl MessageBridge for WithRialtoMessageBridge { bp_rialto::max_extrinsic_size() } - fn weight_limits_of_message_on_bridged_chain(message_payload: &[u8]) -> RangeInclusive { + fn weight_limits_of_message_on_bridged_chain(_message_payload: &[u8]) -> RangeInclusive { // we don't want to relay too large messages + keep reserve for future upgrades let upper_limit = messages::target::maximal_incoming_message_dispatch_weight(bp_rialto::max_extrinsic_weight()); - // given Rialto chain parameters (`TransactionByteFee`, `WeightToFee`, `FeeMultiplierUpdate`), - // the minimal weight of the message may be computed as message.length() - let lower_limit = u32::try_from(message_payload.len()) - .map(Into::into) - .unwrap_or(Weight::MAX); + // we're charging for payload bytes in `WithRialtoMessageBridge::weight_of_delivery_transaction` function + // + // this bridge may be used to deliver all kind of messages, so we're not making any assumptions about + // minimal dispatch weight here - lower_limit..=upper_limit + 0..=upper_limit } fn weight_of_delivery_transaction(message_payload: &[u8]) -> Weight { diff --git a/bridges/bin/rialto/runtime/src/millau_messages.rs b/bridges/bin/rialto/runtime/src/millau_messages.rs index 9207d79edb..b43226d60d 100644 --- a/bridges/bin/rialto/runtime/src/millau_messages.rs +++ b/bridges/bin/rialto/runtime/src/millau_messages.rs @@ -95,17 +95,16 @@ impl MessageBridge for WithMillauMessageBridge { bp_millau::max_extrinsic_size() } - fn weight_limits_of_message_on_bridged_chain(message_payload: &[u8]) -> RangeInclusive { + fn weight_limits_of_message_on_bridged_chain(_message_payload: &[u8]) -> RangeInclusive { // we don't want to relay too large messages + keep reserve for future upgrades let upper_limit = messages::target::maximal_incoming_message_dispatch_weight(bp_millau::max_extrinsic_weight()); - // given Millau chain parameters (`TransactionByteFee`, `WeightToFee`, `FeeMultiplierUpdate`), - // the minimal weight of the message may be computed as message.length() - let lower_limit = u32::try_from(message_payload.len()) - .map(Into::into) - .unwrap_or(Weight::MAX); + // we're charging for payload bytes in `WithMillauMessageBridge::weight_of_delivery_transaction` function + // + // this bridge may be used to deliver all kind of messages, so we're not making any assumptions about + // minimal dispatch weight here - lower_limit..=upper_limit + 0..=upper_limit } fn weight_of_delivery_transaction(message_payload: &[u8]) -> Weight {