Cleanup xc asset config

AstarNetwork · Aug 11, 2023 · b9523a2 · b9523a2
1 parent 17015a6
commit b9523a2
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 27 deletions.
diff --git a/pallets/xc-asset-config/src/lib.rs b/pallets/xc-asset-config/src/lib.rs
@@ -85,21 +85,6 @@ pub mod pallet {
     #[pallet::without_storage_info]
     pub struct Pallet<T>(PhantomData<T>);
 
-    /// Callback definition trait for cross-chain asset registration/deregistration notifications.
-    pub trait XcAssetChanged<T: Config> {
-        /// Will be called by pallet when new asset Id has been registered
-        fn xc_asset_registered(asset_id: T::AssetId);
-
-        /// Will be called by pallet when asset Id has been unregistered
-        fn xc_asset_unregistered(asset_id: T::AssetId);
-    }
-
-    /// Implementation that does nothing
-    impl<T: Config> XcAssetChanged<T> for () {
-        fn xc_asset_registered(_: T::AssetId) {}
-        fn xc_asset_unregistered(_: T::AssetId) {}
-    }
-
     /// Defines conversion between asset Id and cross-chain asset location
     pub trait XcAssetLocation<AssetId> {
         /// Get asset type from assetId
@@ -139,10 +124,6 @@ pub mod pallet {
         /// a AssetLocation
         type AssetId: Member + Parameter + Default + Copy + HasCompact + MaxEncodedLen;
 
-        /// TODO: this has essentially been deprecated and can be removed.
-        /// Callback handling for cross-chain asset registration or unregistration.
-        type XcAssetChanged: XcAssetChanged<Self>;
-
         /// The required origin for managing cross-chain asset configuration
         ///
         /// Should most likely be root.
@@ -243,8 +224,6 @@ pub mod pallet {
             AssetIdToLocation::<T>::insert(&asset_id, asset_location.clone());
             AssetLocationToId::<T>::insert(&asset_location, asset_id);
 
-            T::XcAssetChanged::xc_asset_registered(asset_id);
-
             Self::deposit_event(Event::AssetRegistered {
                 asset_location,
                 asset_id,
@@ -355,7 +334,6 @@ pub mod pallet {
             AssetIdToLocation::<T>::remove(&asset_id);
             AssetLocationToId::<T>::remove(&asset_location);
             AssetLocationUnitsPerSecond::<T>::remove(&asset_location);
-            T::XcAssetChanged::xc_asset_unregistered(asset_id);
 
             Self::deposit_event(Event::AssetRemoved {
                 asset_id,

diff --git a/pallets/xc-asset-config/src/mock.rs b/pallets/xc-asset-config/src/mock.rs
@@ -108,7 +108,6 @@ type AssetId = u128;
 impl pallet_xc_asset_config::Config for Test {
     type RuntimeEvent = RuntimeEvent;
     type AssetId = AssetId;
-    type XcAssetChanged = ();
     type ManagerOrigin = frame_system::EnsureRoot<AccountId>;
     type WeightInfo = ();
 }

diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs
@@ -839,7 +839,6 @@ impl pallet_sudo::Config for Runtime {
 impl pallet_xc_asset_config::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type AssetId = AssetId;
-    type XcAssetChanged = ();
     type ManagerOrigin = EnsureRoot<AccountId>;
     type WeightInfo = pallet_xc_asset_config::weights::SubstrateWeight<Self>;
 }

diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs
@@ -1226,7 +1226,6 @@ impl pallet_proxy::Config for Runtime {
 impl pallet_xc_asset_config::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type AssetId = AssetId;
-    type XcAssetChanged = ();
     // Good enough for testnet since we lack pallet-assets hooks for now
     type ManagerOrigin = EnsureRoot<AccountId>;
     type WeightInfo = pallet_xc_asset_config::weights::SubstrateWeight<Self>;

diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs
@@ -827,7 +827,6 @@ impl pallet_sudo::Config for Runtime {
 impl pallet_xc_asset_config::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type AssetId = AssetId;
-    type XcAssetChanged = ();
     type ManagerOrigin = EnsureRoot<AccountId>;
     type WeightInfo = pallet_xc_asset_config::weights::SubstrateWeight<Self>;
 }

diff --git a/tests/xcm-simulator/src/mocks/parachain.rs b/tests/xcm-simulator/src/mocks/parachain.rs
@@ -391,7 +391,6 @@ parameter_types! {
 impl pallet_xc_asset_config::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type AssetId = AssetId;
-    type XcAssetChanged = ();
     type ManagerOrigin = EnsureRoot<AccountId>;
     type WeightInfo = pallet_xc_asset_config::weights::SubstrateWeight<Runtime>;
 }