replace incremental id type from primites as primites tpyes only used…

… in runtime
galacticcouncil · Dec 19, 2024 · c7be65b · c7be65b
1 parent 2ff4aee
commit c7be65b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/pallets/amm-support/src/lib.rs b/pallets/amm-support/src/lib.rs
@@ -21,11 +21,11 @@
 
 use crate::types::*;
 use frame_support::sp_runtime::app_crypto::sp_core;
-use frame_support::sp_runtime::{ArithmeticError, BoundedVec, DispatchError, DispatchResult};
+use frame_support::sp_runtime::{BoundedVec, DispatchError, DispatchResult};
 use frame_system::pallet_prelude::BlockNumberFor;
-pub use primitives::IncrementalId as IncrementalIdType;
 use sp_core::{ConstU32};
 use sp_std::vec::Vec;
+
 #[cfg(test)]
 mod tests;
 

diff --git a/pallets/amm-support/src/types.rs b/pallets/amm-support/src/types.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 
 pub type AssetId = u32;
 pub type Balance = u128;
-
+pub type IncrementalIdType = u32;
 pub type OtcOrderId = u32;
 
 #[derive(Encode, Decode, Clone, Copy, Debug, Eq, PartialEq, TypeInfo, MaxEncodedLen)]

diff --git a/pallets/route-executor/src/lib.rs b/pallets/route-executor/src/lib.rs
@@ -40,7 +40,7 @@ pub use hydradx_traits::router::{
 
 use orml_traits::arithmetic::{CheckedAdd, CheckedSub};
 pub use pallet_amm_support::types::{ExecutionType, Fee};
-use pallet_amm_support::IncrementalIdType;
+use pallet_amm_support::types::IncrementalIdType;
 use sp_core::U512;
 use sp_runtime::traits::{AccountIdConversion, CheckedDiv};
 use sp_runtime::{ArithmeticError, DispatchError, FixedPointNumber, FixedU128, Saturating, TransactionOutcome};

diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -78,6 +78,3 @@ pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 
 /// Block type.
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-
-/// Incremental ID type
-pub type IncrementalId = u32;
diff --git a/runtime/adapters/src/xcm_exchange.rs b/runtime/adapters/src/xcm_exchange.rs
@@ -1,4 +1,3 @@
-use frame_system::ensure_signed;
 use orml_traits::MultiCurrency;
 use polkadot_xcm::v4::prelude::*;
 use sp_core::Get;
@@ -7,7 +6,7 @@ use sp_std::marker::PhantomData;
 use sp_std::vec;
 use xcm_executor::traits::AssetExchange;
 use xcm_executor::AssetsInHolding;
-use pallet_amm_support::types::{ExecutionType, Fee};
+use pallet_amm_support::types::{ExecutionType};
 
 /// Implements `AssetExchange` to support the `ExchangeAsset` XCM instruction.
 ///