Skip to content

Commit

Permalink
cargo +nightly fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Doordashcon committed May 20, 2024
1 parent 334c35c commit 482d0be
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ pub type Barrier = TrailingSetTopicAsId<
Equals<RelayTreasuryLocation>,
Equals<bridging::SiblingBridgeHub>,
AmbassadorEntities,
SecretaryEntities,
SecretaryEntities,
)>,
// Subscriptions for version tracking are OK.
AllowSubscriptionsFrom<ParentRelayOrSiblingParachains>,
Expand All @@ -369,7 +369,7 @@ pub type WaivedLocations = (
Equals<RelayTreasuryLocation>,
FellowshipEntities,
AmbassadorEntities,
SecretaryEntities,
SecretaryEntities,
);

/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
Expand Down
12 changes: 6 additions & 6 deletions system-parachains/collectives/collectives-polkadot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ pub enum ProxyType {
Fellowship,
/// Ambassador proxy. Allows calls related to the Ambassador Program.
Ambassador,
/// Secretary proxy. Allows calls related to the Secretary collective
/// Secretary proxy. Allows calls related to the Secretary collective
Secretary,
}
impl Default for ProxyType {
Expand Down Expand Up @@ -351,13 +351,13 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
RuntimeCall::Utility { .. } |
RuntimeCall::Multisig { .. }
),
ProxyType::Secretary => matches!(
ProxyType::Secretary => matches!(
c,
RuntimeCall::SecretaryCollective { .. } |
RuntimeCall::SecretaryReferenda { .. } |
RuntimeCall::SecretaryCore { .. } |
RuntimeCall::SecretarySalary { .. } |
RuntimeCall::Utility { .. } |
RuntimeCall::Utility { .. } |
RuntimeCall::Multisig { .. }
),
}
Expand Down Expand Up @@ -716,8 +716,8 @@ construct_runtime!(
AmbassadorCore: pallet_core_fellowship::<Instance2> = 73,
AmbassadorSalary: pallet_salary::<Instance2> = 74,
AmbassadorTreasury: pallet_treasury::<Instance2> = 75,
// The Secretary Collective

// The Secretary Collective
// pub type SecretaryCollectiveInstance = pallet_ranked_cllective::instance3;
SecretaryCollective: pallet_ranked_collective::<Instance3> = 80,
//pub type SecretaryReferandaInstance = pallet_referanda::Instance3;
Expand Down Expand Up @@ -809,7 +809,7 @@ mod benches {
[pallet_core_fellowship, AmbassadorCore]
[pallet_salary, AmbassadorSalary]
[pallet_treasury, AmbassadorTreasury]
[pallet_referenda, SecretaryReferenda]
[pallet_referenda, SecretaryReferenda]
[pallet_ranked_cllective, SecretaryCollective]
[pallet_core_fellowship, SecretaryCore]
[pallet_salary, SecretarySalary]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
mod origins;
mod tracks;
use crate::{
fellowship::{pallet_fellowship_origins::Fellows, FellowshipAdminBodyId, FellowshipCollectiveInstance, ranks::DAN_3},
fellowship::{
pallet_fellowship_origins::Fellows, ranks::DAN_3, FellowshipAdminBodyId,
FellowshipCollectiveInstance,
},
impls::ToParentTreasury,
xcm_config::{LocationToAccountId, TreasurerBodyId},
*,
Expand Down
2 changes: 1 addition & 1 deletion system-parachains/constants/src/polkadot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub mod account {
pub const FELLOWSHIP_TREASURY_PALLET_ID: PalletId = PalletId(*b"py/feltr");
/// Ambassador treasury pallet ID
pub const AMBASSADOR_TREASURY_PALLET_ID: PalletId = PalletId(*b"py/ambtr");
/// Secretary treasury pallet ID
/// Secretary treasury pallet ID
pub const SECRETARY_TREASURY_PALLET_ID: PalletId = PalletId(*b"py/secrt");
}

Expand Down

0 comments on commit 482d0be

Please sign in to comment.