CI: Fix fmt + typescript api update

moondance-labs · Sep 11, 2024 · 9d98231 · 9d98231
1 parent 465ad1b
commit 9d98231
Show file tree

Hide file tree

Showing 10 changed files with 850 additions and 848 deletions.
diff --git a/pallets/collator-assignment/src/lib.rs b/pallets/collator-assignment/src/lib.rs
@@ -41,9 +41,9 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use core::ops::Mul;
 use {
     crate::assignment::{Assignment, ChainNumCollators},
+    core::ops::Mul,
     frame_support::{pallet_prelude::*, traits::Currency},
     frame_system::pallet_prelude::BlockNumberFor,
     rand::{seq::SliceRandom, SeedableRng},

diff --git a/pallets/collator-assignment/src/mock.rs b/pallets/collator-assignment/src/mock.rs
@@ -14,11 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Tanssi.  If not, see <http://www.gnu.org/licenses/>
 
-use crate::CoreAllocationConfiguration;
 use {
     crate::{
         self as pallet_collator_assignment, pallet::CollatorContainerChain,
-        GetRandomnessForNextBlock, RotateCollatorsEveryNSessions,
+        CoreAllocationConfiguration, GetRandomnessForNextBlock, RotateCollatorsEveryNSessions,
     },
     frame_support::{
         parameter_types,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/runtime/dancebox/src/lib.rs b/runtime/dancebox/src/lib.rs
@@ -36,7 +36,6 @@ pub mod weights;
 #[cfg(test)]
 mod tests;
 
-use pallet_collator_assignment::CoreAllocationConfiguration;
 use {
     cumulus_pallet_parachain_system::{
         RelayChainStateProof, RelayNumberMonotonicallyIncreases, RelaychainDataProvider,
@@ -887,14 +886,6 @@ impl RemoveParaIdsWithNoCredits for RemoveParaIdsWithNoCreditsImpl {
     }
 }
 
-pub struct GetCoreAllocationConfigurationImpl;
-
-impl Get<Option<CoreAllocationConfiguration>> for GetCoreAllocationConfigurationImpl {
-    fn get() -> Option<CoreAllocationConfiguration> {
-        None
-    }
-}
-
 impl pallet_collator_assignment::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type HostConfiguration = Configuration;
@@ -910,7 +901,7 @@ impl pallet_collator_assignment::Config for Runtime {
     type CollatorAssignmentTip = ServicesPayment;
     type Currency = Balances;
     type ForceEmptyOrchestrator = ConstBool<false>;
-    type CoreAllocationConfiguration = GetCoreAllocationConfigurationImpl;
+    type CoreAllocationConfiguration = ();
     type WeightInfo = weights::pallet_collator_assignment::SubstrateWeight<Runtime>;
 }
 

diff --git a/runtime/flashbox/src/lib.rs b/runtime/flashbox/src/lib.rs
@@ -37,7 +37,6 @@ pub mod weights;
 #[cfg(test)]
 mod tests;
 
-use pallet_collator_assignment::CoreAllocationConfiguration;
 use {
     cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases,
     cumulus_primitives_core::{relay_chain::SessionIndex, BodyId, ParaId},
@@ -734,14 +733,6 @@ impl ShouldRotateAllCollators<u32> for NeverRotateCollators {
     }
 }
 
-pub struct GetCoreAllocationConfigurationImpl;
-
-impl Get<Option<CoreAllocationConfiguration>> for GetCoreAllocationConfigurationImpl {
-    fn get() -> Option<CoreAllocationConfiguration> {
-        None
-    }
-}
-
 impl pallet_collator_assignment::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type HostConfiguration = Configuration;
@@ -756,7 +747,7 @@ impl pallet_collator_assignment::Config for Runtime {
     type CollatorAssignmentTip = ServicesPayment;
     type Currency = Balances;
     type ForceEmptyOrchestrator = ConstBool<false>;
-    type CoreAllocationConfiguration = GetCoreAllocationConfigurationImpl;
+    type CoreAllocationConfiguration = ();
     type WeightInfo = weights::pallet_collator_assignment::SubstrateWeight<Runtime>;
 }
 

diff --git a/solo-chains/runtime/starlight/src/tests/collator_assignment_tests.rs b/solo-chains/runtime/starlight/src/tests/collator_assignment_tests.rs
@@ -18,7 +18,6 @@
 
 use crate::{Configuration, GetCoreAllocationConfigurationImpl};
 use frame_support::dispatch::RawOrigin;
-use frame_system::Origin;
 use primitives::vstaging::SchedulerParams;
 use sp_core::Get;
 use {