difftreelog
fix merge
in: master
2 files changed
pallets/configuration/src/lib.rsdiffbeforeafterboth--- a/pallets/configuration/src/lib.rs
+++ b/pallets/configuration/src/lib.rs
@@ -42,7 +42,7 @@
mod pallet {
use super::*;
use frame_support::{
- traits::{fungible, Get, ReservableCurrency, Currency},
+ traits::{fungible, Get},
pallet_prelude::{StorageValue, ValueQuery, DispatchResult, IsType},
log,
};
runtime/common/config/pallets/collator_selection.rsdiffbeforeafterboth59 pub const MaxSubAccounts: u32 = 100;59 pub const MaxSubAccounts: u32 = 100;60 pub const MaxAdditionalFields: u32 = 100;60 pub const MaxAdditionalFields: u32 = 100;61 pub const MaxRegistrars: u32 = 20;61 pub const MaxRegistrars: u32 = 20;62 pub const LicenceBondIdentifier: [u8; 16] = *b"licenceidentifie";62}63}636464impl pallet_identity::Config for Runtime {65impl pallet_identity::Config for Runtime {93 type ValidatorIdOf = pallet_collator_selection::IdentityCollator;94 type ValidatorIdOf = pallet_collator_selection::IdentityCollator;94 type ValidatorRegistration = Session;95 type ValidatorRegistration = Session;95 type WeightInfo = pallet_collator_selection::weights::SubstrateWeight<Runtime>;96 type WeightInfo = pallet_collator_selection::weights::SubstrateWeight<Runtime>;97 type LicenceBondIdentifier = LicenceBondIdentifier;96}98}9799