remove additional pallets

moondance-labs · Sep 3, 2024 · 35159d6 · 35159d6
1 parent 40919ae
commit 35159d6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 56 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/solo-chains/runtime/starlight/Cargo.toml b/solo-chains/runtime/starlight/Cargo.toml
@@ -71,7 +71,6 @@ pallet-democracy = { workspace = true }
 pallet-elections-phragmen = { workspace = true }
 pallet-grandpa = { workspace = true }
 pallet-identity = { workspace = true }
-pallet-indices = { workspace = true }
 pallet-initializer = { workspace = true }
 pallet-invulnerables = { workspace = true }
 pallet-membership = { workspace = true }
@@ -84,7 +83,6 @@ pallet-parameters = { workspace = true }
 pallet-preimage = { workspace = true }
 pallet-proxy = { workspace = true }
 pallet-ranked-collective = { workspace = true }
-pallet-recovery = { workspace = true }
 pallet-referenda = { workspace = true }
 pallet-root-testing = { workspace = true }
 pallet-scheduler = { workspace = true }
@@ -199,7 +197,6 @@ std = [
 	"pallet-elections-phragmen/std",
 	"pallet-grandpa/std",
 	"pallet-identity/std",
-	"pallet-indices/std",
 	"pallet-initializer/std",
 	"pallet-invulnerables/std",
 	"pallet-membership/std",
@@ -213,7 +210,6 @@ std = [
 	"pallet-preimage/std",
 	"pallet-proxy/std",
 	"pallet-ranked-collective/std",
-	"pallet-recovery/std",
 	"pallet-referenda/std",
 	"pallet-registrar-runtime-api/std",
 	"pallet-registrar/std",
@@ -295,7 +291,6 @@ runtime-benchmarks = [
 	"pallet-elections-phragmen/runtime-benchmarks",
 	"pallet-grandpa/runtime-benchmarks",
 	"pallet-identity/runtime-benchmarks",
-	"pallet-indices/runtime-benchmarks",
 	"pallet-invulnerables/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
@@ -308,7 +303,6 @@ runtime-benchmarks = [
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-ranked-collective/runtime-benchmarks",
-	"pallet-recovery/runtime-benchmarks",
 	"pallet-referenda/runtime-benchmarks",
 	"pallet-registrar/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
@@ -361,7 +355,6 @@ try-runtime = [
 	"pallet-elections-phragmen/try-runtime",
 	"pallet-grandpa/try-runtime",
 	"pallet-identity/try-runtime",
-	"pallet-indices/try-runtime",
 	"pallet-initializer/try-runtime",
 	"pallet-invulnerables/try-runtime",
 	"pallet-membership/try-runtime",
@@ -375,7 +368,6 @@ try-runtime = [
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-ranked-collective/try-runtime",
-	"pallet-recovery/try-runtime",
 	"pallet-referenda/try-runtime",
 	"pallet-registrar/try-runtime",
 	"pallet-root-testing/try-runtime",

diff --git a/solo-chains/runtime/starlight/src/lib.rs b/solo-chains/runtime/starlight/src/lib.rs
@@ -44,7 +44,7 @@ use {
     parachains_scheduler::common::Assignment,
     parity_scale_codec::{Decode, Encode, MaxEncodedLen},
     primitives::{
-        slashing, AccountIndex, ApprovalVotingParams, BlockNumber, CandidateEvent, CandidateHash,
+        slashing, ApprovalVotingParams, BlockNumber, CandidateEvent, CandidateHash,
         CommittedCandidateReceipt, CoreIndex, CoreState, DisputeState, ExecutorParams,
         GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment,
         NodeFeatures, Nonce, OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes,
@@ -354,18 +354,6 @@ impl pallet_babe::Config for Runtime {
         pallet_babe::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
 }
 
-parameter_types! {
-    pub const IndexDeposit: Balance = 100 * CENTS;
-}
-
-impl pallet_indices::Config for Runtime {
-    type AccountIndex = AccountIndex;
-    type Currency = Balances;
-    type Deposit = IndexDeposit;
-    type RuntimeEvent = RuntimeEvent;
-    type WeightInfo = ();
-}
-
 parameter_types! {
     pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
     pub const MaxLocks: u32 = 50;
@@ -661,24 +649,6 @@ impl pallet_multisig::Config for Runtime {
     type WeightInfo = ();
 }
 
-parameter_types! {
-    pub const ConfigDepositBase: Balance = 500 * CENTS;
-    pub const FriendDepositFactor: Balance = 50 * CENTS;
-    pub const MaxFriends: u16 = 9;
-    pub const RecoveryDeposit: Balance = 500 * CENTS;
-}
-
-impl pallet_recovery::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
-    type WeightInfo = ();
-    type RuntimeCall = RuntimeCall;
-    type Currency = Balances;
-    type ConfigDepositBase = ConfigDepositBase;
-    type FriendDepositFactor = FriendDepositFactor;
-    type MaxFriends = MaxFriends;
-    type RecoveryDeposit = RecoveryDeposit;
-}
-
 parameter_types! {
     // One storage item; key size 32, value size 8; .
     pub const ProxyDepositBase: Balance = deposit(1, 8);
@@ -727,9 +697,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
                 RuntimeCall::System(..) |
 				RuntimeCall::Babe(..) |
 				RuntimeCall::Timestamp(..) |
-				RuntimeCall::Indices(pallet_indices::Call::claim {..}) |
-				RuntimeCall::Indices(pallet_indices::Call::free {..}) |
-				RuntimeCall::Indices(pallet_indices::Call::freeze {..}) |
 				// Specifically omitting Indices `transfer`, `force_transfer`
 				// Specifically omitting the entire Balances pallet
 				RuntimeCall::Session(..) |
@@ -742,12 +709,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::Whitelist(..) |
 				RuntimeCall::Utility(..) |
 				RuntimeCall::Identity(..) |
-				RuntimeCall::Recovery(pallet_recovery::Call::as_recovered {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::vouch_recovery {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::claim_recovery {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::close_recovery {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::remove_recovery {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::cancel_recovered {..}) |
 				RuntimeCall::Scheduler(..) |
 				RuntimeCall::Proxy(..) |
 				RuntimeCall::Multisig(..) |
@@ -1419,7 +1380,6 @@ construct_runtime! {
         Babe: pallet_babe = 1,
 
         Timestamp: pallet_timestamp = 2,
-        Indices: pallet_indices = 3,
         Balances: pallet_balances = 4,
         Parameters: pallet_parameters = 6,
         TransactionPayment: pallet_transaction_payment = 33,
@@ -1451,9 +1411,6 @@ construct_runtime! {
         // Less simple identity module.
         Identity: pallet_identity = 25,
 
-        // Social recovery module.
-        Recovery: pallet_recovery = 27,
-
         // System scheduler.
         Scheduler: pallet_scheduler = 29,
 
@@ -1727,14 +1684,12 @@ mod benches {
         [frame_benchmarking::baseline, Baseline::<Runtime>]
         [pallet_conviction_voting, ConvictionVoting]
         [pallet_identity, Identity]
-        [pallet_indices, Indices]
         [pallet_message_queue, MessageQueue]
         [pallet_multisig, Multisig]
         [pallet_parameters, Parameters]
         [pallet_preimage, Preimage]
         [pallet_proxy, Proxy]
         [pallet_ranked_collective, FellowshipCollective]
-        [pallet_recovery, Recovery]
         [pallet_referenda, Referenda]
         [pallet_referenda, FellowshipReferenda]
         [pallet_scheduler, Scheduler]