Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Companion PR to #5695 #1030

Merged
gavofyork merged 14 commits into from
Apr 24, 2020
Merged

Companion PR to #5695 #1030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3bfedb6
add module ids to kusama runtime
emostov Apr 18, 2020
c3dd829
update kusam with polkadot runtimes to have moduleids configured
emostov Apr 18, 2020
fa502b9
trivial
emostov Apr 20, 2020
2fa74b9
define module id for treasury in crowdfund.rs
emostov Apr 20, 2020
9cfb0cd
crodfund builds without issue
emostov Apr 20, 2020
8c8dc4e
remove commented out code
emostov Apr 20, 2020
35b9d01
switch crowdfund to configurable moduleid
emostov Apr 20, 2020
a183b01
test-runtime passing
emostov Apr 20, 2020
e8665ab
merge in moduleid updates
emostov Apr 20, 2020
0dbc870
trivial syntax
emostov Apr 20, 2020
60b0a45
add module id to mock
emostov Apr 20, 2020
c22d287
Merge remote-tracking branch 'upstream/master'
emostov Apr 22, 2020
06c07ca
Merge remote-tracking branch 'origin/master' into emostov_module_id
bkchr Apr 24, 2020
568e40d
Update `Cargo.lock`
bkchr Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update kusam with polkadot runtimes to have moduleids configured
  • Loading branch information
@emostov
emostov committed Apr 18, 2020
commit c3dd82975e99c352b7fdeb8e01036bc0de18b7dd
4 changes: 3 additions & 1 deletion runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ use sp_core::OpaqueMetadata;
use sp_staking::SessionIndex;
use frame_support::{
parameter_types, construct_runtime, debug,
traits::{KeyOwnerProofSystem, SplitTwoWays, Randomness},
traits::{KeyOwnerProofSystem, SplitTwoWays, Randomness, LockIdentifier},
};
use im_online::sr25519::AuthorityId as ImOnlineId;
use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
Expand Down Expand Up @@ -691,6 +691,7 @@ parameter_types! {
pub const PeriodSpend: Balance = 500 * DOLLARS;
pub const MaxLockDuration: BlockNumber = 36 * 30 * DAYS;
pub const ChallengePeriod: BlockNumber = 7 * DAYS;
pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie");
}

impl society::Trait for Runtime {
Expand All @@ -707,6 +708,7 @@ impl society::Trait for Runtime {
type FounderSetOrigin = collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>;
type SuspensionJudgementOrigin = society::EnsureFounder<Runtime>;
type ChallengePeriod = ChallengePeriod;
type ModuleId = SocietyModuleId;
}

parameter_types! {
Expand Down
8 changes: 6 additions & 2 deletions runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use primitives::{
parachain::{self, ActiveParas, AbridgedCandidateReceipt, SigningContext}, ValidityError,
};
use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
create_runtime_str, generic, impl_opaque_keys, ModuleId,
ApplyExtrinsicResult, KeyTypeId, Percent, Permill, Perbill, Perquintill, RuntimeDebug,
transaction_validity::{
TransactionValidity, InvalidTransaction, TransactionValidityError, TransactionSource, TransactionPriority,
Expand All @@ -55,7 +55,7 @@ use sp_core::OpaqueMetadata;
use sp_staking::SessionIndex;
use frame_support::{
parameter_types, construct_runtime, debug,
traits::{KeyOwnerProofSystem, SplitTwoWays, Randomness},
traits::{KeyOwnerProofSystem, SplitTwoWays, Randomness, LockIdentifier},
};
use im_online::sr25519::AuthorityId as ImOnlineId;
use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
Expand Down Expand Up @@ -394,6 +394,7 @@ parameter_types! {
/// 13 members initially, to be increased to 23 eventually.
pub const DesiredMembers: u32 = 13;
pub const DesiredRunnersUp: u32 = 20;
pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
}

impl elections_phragmen::Trait for Runtime {
Expand All @@ -410,6 +411,7 @@ impl elections_phragmen::Trait for Runtime {
type DesiredMembers = DesiredMembers;
type DesiredRunnersUp = DesiredRunnersUp;
type TermDuration = TermDuration;
type ModuleId = ElectionsPhragmenModuleId;
}

parameter_types! {
Expand Down Expand Up @@ -440,6 +442,7 @@ parameter_types! {
pub const ProposalBondMinimum: Balance = 100 * DOLLARS;
pub const SpendPeriod: BlockNumber = 24 * DAYS;
pub const Burn: Permill = Permill::from_percent(1);
pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");

pub const TipCountdown: BlockNumber = 1 * DAYS;
pub const TipFindersFee: Percent = Percent::from_percent(20);
Expand All @@ -462,6 +465,7 @@ impl treasury::Trait for Runtime {
type ProposalBondMinimum = ProposalBondMinimum;
type SpendPeriod = SpendPeriod;
type Burn = Burn;
type ModuleId = TreasuryModuleId;
}

impl offences::Trait for Runtime {
Expand Down