Revert the checks

Snowfork · Jan 17, 2024 · af15053 · af15053
1 parent 85cb976
commit af15053
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/parachain/pallets/outbound-queue/src/process_message_impl.rs b/parachain/pallets/outbound-queue/src/process_message_impl.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 //! Implementation for [`frame_support::traits::ProcessMessage`]
 use super::*;
 use crate::weights::WeightInfo;

diff --git a/parachain/pallets/outbound-queue/src/send_message_impl.rs b/parachain/pallets/outbound-queue/src/send_message_impl.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 //! Implementation for [`snowbridge_core::outbound::SendMessage`]
 use super::*;
 use bridge_hub_common::AggregateMessageOrigin;
@@ -15,7 +17,6 @@ use snowbridge_core::{
 	},
 	ChannelId, PRIMARY_GOVERNANCE_CHANNEL,
 };
-use sp_arithmetic::traits::Zero;
 use sp_core::H256;
 use sp_runtime::BoundedVec;
 
@@ -58,14 +59,7 @@ where
 			.unwrap_or_else(|| unique((message.channel_id, &message.command)).into());
 
 		let gas_used_at_most = T::GasMeter::maximum_gas_used_at_most(&message.command);
-		ensure!(
-			gas_used_at_most > T::GasMeter::MAXIMUM_BASE_GAS &&
-				gas_used_at_most < T::GasMeter::MAXIMUM_GAS_CAP,
-			SendError::MessageInvalidGasFees
-		);
 		let fee = Self::calculate_fee(gas_used_at_most, T::PricingParameters::get());
-		let zero_fee = <Self as SendMessageFeeProvider>::Balance::zero();
-		ensure!(fee.local > zero_fee && fee.remote > zero_fee, SendError::MessageInvalidGasFees);
 
 		let queued_message: VersionedQueuedMessage = QueuedMessage {
 			id: message_id,

diff --git a/parachain/pallets/outbound-queue/src/types.rs b/parachain/pallets/outbound-queue/src/types.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 use codec::{Decode, Encode};
 use ethabi::Token;
 use frame_support::traits::ProcessMessage;

diff --git a/parachain/pallets/system/src/tests.rs b/parachain/pallets/system/src/tests.rs
@@ -203,7 +203,7 @@ fn set_pricing_parameters_invalid() {
 		params = Parameters::get();
 		params.rewards.remote = sp_core::U256::zero();
 		assert_noop!(
-			EthereumSystem::set_pricing_parameters(origin.clone(), params),
+			EthereumSystem::set_pricing_parameters(origin, params),
 			Error::<Test>::InvalidPricingParameters
 		);
 	});

diff --git a/parachain/primitives/core/src/outbound.rs b/parachain/primitives/core/src/outbound.rs
@@ -339,18 +339,13 @@ pub enum SendError {
 	Halted,
 	/// Invalid Channel
 	InvalidChannel,
-	/// Message with gas or fees calculated invalid
-	MessageInvalidGasFees,
 }
 
 pub trait GasMeter {
 	/// All the gas used for submitting a message to Ethereum, minus the cost of dispatching
 	/// the command within the message
 	const MAXIMUM_BASE_GAS: u64;
 
-	/// Hard limit for the maximum gas allowed among all commands
-	const MAXIMUM_GAS_CAP: u64;
-
 	fn maximum_gas_used_at_most(command: &Command) -> u64 {
 		Self::MAXIMUM_BASE_GAS + Self::maximum_dispatch_gas_used_at_most(command)
 	}
@@ -376,8 +371,6 @@ impl GasMeter for ConstantGasMeter {
 	// for message verification
 	const MAXIMUM_BASE_GAS: u64 = 185_000;
 
-	const MAXIMUM_GAS_CAP: u64 = 5_000_000;
-
 	fn maximum_dispatch_gas_used_at_most(command: &Command) -> u64 {
 		match command {
 			Command::CreateAgent { .. } => 275_000,
@@ -412,8 +405,6 @@ impl GasMeter for ConstantGasMeter {
 impl GasMeter for () {
 	const MAXIMUM_BASE_GAS: u64 = 1;
 
-	const MAXIMUM_GAS_CAP: u64 = 100;
-
 	fn maximum_dispatch_gas_used_at_most(_: &Command) -> u64 {
 		1
 	}