Clean: Remove unused gateway origin (#1976)

* remove unused gateway origin * fix: reanchor submodule to 6e8f1a29dff0d7cf5ff74285cfffadae8a8b303f --------- Co-authored-by: William Freudenberger <[email protected]>
centrifuge · Aug 18, 2024 · c55e74f · c55e74f
1 parent 7126ef9
commit c55e74f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 70 deletions.
diff --git a/pallets/liquidity-pools-gateway/src/lib.rs b/pallets/liquidity-pools-gateway/src/lib.rs
@@ -50,17 +50,15 @@ use crate::{
 	weights::WeightInfo,
 };
 
-mod origin;
-pub use origin::*;
-
 pub mod message;
 
 pub mod weights;
 
+mod message_processing;
+
 #[cfg(test)]
 mod mock;
 
-mod message_processing;
 #[cfg(test)]
 mod tests;
 
@@ -74,25 +72,11 @@ pub mod pallet {
 	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T>(_);
 
-	#[pallet::origin]
-	pub type Origin = GatewayOrigin;
-
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		/// The origin type.
-		type RuntimeOrigin: Into<Result<GatewayOrigin, <Self as frame_system::Config>::RuntimeOrigin>>
-			+ From<GatewayOrigin>;
-
 		/// The event type.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
-		/// The LocalOrigin ensures that some calls can only be performed from a
-		/// local context i.e. a different pallet.
-		type LocalEVMOrigin: EnsureOrigin<
-			<Self as frame_system::Config>::RuntimeOrigin,
-			Success = GatewayOrigin,
-		>;
-
 		/// The AdminOrigin ensures that some calls can only be performed by
 		/// admins.
 		type AdminOrigin: EnsureOrigin<<Self as frame_system::Config>::RuntimeOrigin>;

diff --git a/pallets/liquidity-pools-gateway/src/mock.rs b/pallets/liquidity-pools-gateway/src/mock.rs
@@ -16,7 +16,7 @@ use scale_info::TypeInfo;
 use sp_core::{crypto::AccountId32, H160};
 use sp_runtime::{traits::IdentityLookup, DispatchError, DispatchResult};
 
-use crate::{pallet as pallet_liquidity_pools_gateway, EnsureLocal, GatewayMessage};
+use crate::{pallet as pallet_liquidity_pools_gateway, GatewayMessage};
 
 pub const TEST_SESSION_ID: u32 = 1;
 pub const TEST_EVM_CHAIN: EVMChainId = 1;
@@ -202,7 +202,6 @@ frame_support::parameter_types! {
 impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type AdminOrigin = EnsureRoot<AccountId32>;
 	type InboundMessageHandler = MockLiquidityPools;
-	type LocalEVMOrigin = EnsureLocal;
 	type MaxIncomingMessageSize = MaxIncomingMessageSize;
 	type MaxRouterCount = MaxRouterCount;
 	type Message = Message;
@@ -211,7 +210,6 @@ impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type RouterId = RouterId;
 	type RouterProvider = TestRouterProvider;
 	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
 	type Sender = Sender;
 	type SessionId = u32;
 	type WeightInfo = ();

diff --git a/pallets/liquidity-pools-gateway/src/origin.rs b/pallets/liquidity-pools-gateway/src/origin.rs
diff --git a/runtime/altair/src/lib.rs b/runtime/altair/src/lib.rs
@@ -1775,7 +1775,6 @@ parameter_types! {
 impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type InboundMessageHandler = LiquidityPools;
-	type LocalEVMOrigin = pallet_liquidity_pools_gateway::EnsureLocal;
 	type MaxIncomingMessageSize = MaxIncomingMessageSize;
 	type MaxRouterCount = MaxRouterCount;
 	type Message = pallet_liquidity_pools::Message;
@@ -1784,7 +1783,6 @@ impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type RouterId = RouterId;
 	type RouterProvider = LPGatewayRouterProvider;
 	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
 	type Sender = Sender;
 	type SessionId = LPGatewaySessionId;
 	type WeightInfo = ();
@@ -2096,7 +2094,7 @@ construct_runtime!(
 		BlockRewards: pallet_block_rewards::{Pallet, Call, Storage, Event<T>, Config<T>} = 105,
 		Keystore: pallet_keystore::{Pallet, Call, Storage, Event<T>} = 106,
 		LiquidityPools: pallet_liquidity_pools::{Pallet, Call, Storage, Event<T>} = 108,
-		LiquidityPoolsGateway: pallet_liquidity_pools_gateway::{Pallet, Call, Storage, Event<T>, Origin } = 109,
+		LiquidityPoolsGateway: pallet_liquidity_pools_gateway::{Pallet, Call, Storage, Event<T> } = 109,
 		LiquidityRewardsBase: pallet_rewards::<Instance2>::{Pallet, Storage, Event<T>, Config<T>} = 110,
 		LiquidityRewards: pallet_liquidity_rewards::{Pallet, Call, Storage, Event<T>} = 111,
 		GapRewardMechanism: pallet_rewards::mechanism::gap = 112,

diff --git a/runtime/centrifuge/src/lib.rs b/runtime/centrifuge/src/lib.rs
@@ -1874,7 +1874,6 @@ parameter_types! {
 impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type AdminOrigin = EnsureAccountOrRootOr<LpAdminAccount, TwoThirdOfCouncil>;
 	type InboundMessageHandler = LiquidityPools;
-	type LocalEVMOrigin = pallet_liquidity_pools_gateway::EnsureLocal;
 	type MaxIncomingMessageSize = MaxIncomingMessageSize;
 	type MaxRouterCount = MaxRouterCount;
 	type Message = pallet_liquidity_pools::Message;
@@ -1883,7 +1882,6 @@ impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type RouterId = RouterId;
 	type RouterProvider = LPGatewayRouterProvider;
 	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
 	type Sender = Sender;
 	type SessionId = LPGatewaySessionId;
 	type WeightInfo = ();
@@ -2099,7 +2097,7 @@ construct_runtime!(
 		LiquidityRewardsBase: pallet_rewards::<Instance2>::{Pallet, Storage, Event<T>, Config<T>} = 104,
 		LiquidityRewards: pallet_liquidity_rewards::{Pallet, Call, Storage, Event<T>} = 105,
 		GapRewardMechanism: pallet_rewards::mechanism::gap = 106,
-		LiquidityPoolsGateway: pallet_liquidity_pools_gateway::{Pallet, Call, Storage, Event<T>, Origin } = 107,
+		LiquidityPoolsGateway: pallet_liquidity_pools_gateway::{Pallet, Call, Storage, Event<T> } = 107,
 		OrderBook: pallet_order_book::{Pallet, Call, Storage, Event<T>} = 108,
 		ForeignInvestments: pallet_foreign_investments::{Pallet, Storage, Event<T>} = 109,
 		TransferAllowList: pallet_transfer_allowlist::{Pallet, Call, Storage, Event<T>, HoldReason} = 110,

diff --git a/runtime/development/src/lib.rs b/runtime/development/src/lib.rs
@@ -1880,7 +1880,6 @@ parameter_types! {
 impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type AdminOrigin = EnsureRootOr<HalfOfCouncil>;
 	type InboundMessageHandler = LiquidityPools;
-	type LocalEVMOrigin = pallet_liquidity_pools_gateway::EnsureLocal;
 	type MaxIncomingMessageSize = MaxIncomingMessageSize;
 	type MaxRouterCount = MaxRouterCount;
 	type Message = pallet_liquidity_pools::Message;
@@ -1889,7 +1888,6 @@ impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type RouterId = RouterId;
 	type RouterProvider = LPGatewayRouterProvider;
 	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
 	type Sender = Sender;
 	type SessionId = LPGatewaySessionId;
 	type WeightInfo = ();
@@ -2207,7 +2205,7 @@ construct_runtime!(
 		BlockRewards: pallet_block_rewards::{Pallet, Call, Storage, Event<T>, Config<T>} = 111,
 		TransferAllowList: pallet_transfer_allowlist::{Pallet, Call, Storage, Event<T>, HoldReason} = 112,
 		GapRewardMechanism: pallet_rewards::mechanism::gap = 114,
-		LiquidityPoolsGateway: pallet_liquidity_pools_gateway::{Pallet, Call, Storage, Event<T>, Origin } = 115,
+		LiquidityPoolsGateway: pallet_liquidity_pools_gateway::{Pallet, Call, Storage, Event<T> } = 115,
 		OrderBook: pallet_order_book::{Pallet, Call, Storage, Event<T>} = 116,
 		ForeignInvestments: pallet_foreign_investments::{Pallet, Storage, Event<T>} = 117,
 		OraclePriceFeed: pallet_oracle_feed::{Pallet, Call, Storage, Event<T>} = 118,

diff --git a/runtime/integration-tests/src/config.rs b/runtime/integration-tests/src/config.rs
@@ -277,8 +277,7 @@ pub trait Runtime:
 		+ Clone
 		+ OriginTrait<Call = <Self as frame_system::Config>::RuntimeCall, AccountId = AccountId>
 		+ From<pallet_ethereum::RawOrigin>
-		+ Into<Result<pallet_ethereum::Origin, <Self as frame_system::Config>::RuntimeOrigin>>
-		+ From<pallet_liquidity_pools_gateway::GatewayOrigin>;
+		+ Into<Result<pallet_ethereum::Origin, <Self as frame_system::Config>::RuntimeOrigin>>;
 
 	/// Block used by the runtime
 	type BlockExt: Block<

diff --git a/runtime/integration-tests/submodules/liquidity-pools b/runtime/integration-tests/submodules/liquidity-pools