Skip to content

Content directory schema refactoring: move property related logic to separate file #1436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bedeho merged 16 commits into from
Sep 28, 2020
Merged

Content directory schema refactoring: move property related logic to separate file #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6445771
proposals_codex: Remove SetLead proposal type
iorveth Sep 15, 2020
bf8c282
proposals_codex: Remove set_content_working_group_mint_capacity prop…
iorveth Sep 15, 2020
d63ea35
proposals_codex: Remove set_content_working_group_mint_capacity prop…
iorveth Sep 15, 2020
e7a6103
Remove content-working-group from proposals_pallet
iorveth Sep 15, 2020
95ddc4e
proposals_codex: remove old dev dependencies
iorveth Sep 16, 2020
5876f37
proposals_codex: implement working_group trait for mock runtime
iorveth Sep 16, 2020
e0fde1a
Merge remote-tracking branch 'origin/content_directory_second_try' in…
iorveth Sep 16, 2020
5abe287
Fix ensure_entities_creation_limits_are_valid function
iorveth Sep 21, 2020
8550b27
fix type name in proposal_codex_module
iorveth Sep 21, 2020
907dc0d
Add WorkingGroup::Content enum variant, refactor integration tests
iorveth Sep 21, 2020
64faa21
Content directory refactoring: move property related logic to separat…
iorveth Sep 22, 2020
0212262
Split up working_group StakingEventsHandler into ContentDirectoryWGSt…
iorveth Sep 22, 2020
5062696
working_group proposals integration coverage initial work
iorveth Sep 24, 2020
f16bb21
integration/working_group_proposals: Fix broken tests
iorveth Sep 25, 2020
caf2590
integration/working_group_proposal: Upgrade remaining tests to generi…
iorveth Sep 28, 2020
d0842cb
Merge remote-tracking branch 'origin/proposal_codex_upgrade' into con…
iorveth Sep 28, 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
29 changes: 24 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 2 additions & 8 deletions node/src/chain_spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,12 +352,6 @@ pub fn testnet_genesis(
.set_election_parameters_proposal_voting_period,
set_election_parameters_proposal_grace_period: cpcp
.set_election_parameters_proposal_grace_period,
set_content_working_group_mint_capacity_proposal_voting_period: cpcp
.set_content_working_group_mint_capacity_proposal_voting_period,
set_content_working_group_mint_capacity_proposal_grace_period: cpcp
.set_content_working_group_mint_capacity_proposal_grace_period,
set_lead_proposal_voting_period: cpcp.set_lead_proposal_voting_period,
set_lead_proposal_grace_period: cpcp.set_lead_proposal_grace_period,
spending_proposal_voting_period: cpcp.spending_proposal_voting_period,
spending_proposal_grace_period: cpcp.spending_proposal_grace_period,
add_working_group_opening_proposal_voting_period: cpcp
Expand All @@ -373,9 +367,9 @@ pub fn testnet_genesis(
fill_working_group_leader_opening_proposal_grace_period: cpcp
.fill_working_group_leader_opening_proposal_grace_period,
set_working_group_mint_capacity_proposal_voting_period: cpcp
.set_content_working_group_mint_capacity_proposal_voting_period,
.set_working_group_mint_capacity_proposal_voting_period,
set_working_group_mint_capacity_proposal_grace_period: cpcp
.set_content_working_group_mint_capacity_proposal_grace_period,
.set_working_group_mint_capacity_proposal_grace_period,
decrease_working_group_leader_stake_proposal_voting_period: cpcp
.decrease_working_group_leader_stake_proposal_voting_period,
decrease_working_group_leader_stake_proposal_grace_period: cpcp
Expand Down
4 changes: 4 additions & 0 deletions runtime-modules/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ edition = '2018'

[dependencies]
serde = { version = "1.0.101", optional = true, features = ["derive"] }
strum = {version = "0.19", optional = true}
strum_macros = {version = "0.19", optional = true}
codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
sp-runtime = { package = 'sp-runtime', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
Expand All @@ -16,6 +18,8 @@ pallet-timestamp = { package = 'pallet-timestamp', default-features = false, git
default = ['std']
std = [
'serde',
'strum',
'strum_macros',
'codec/std',
'sp-runtime/std',
'frame-support/std',
Expand Down
6 changes: 5 additions & 1 deletion runtime-modules/common/src/working_group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
use codec::{Decode, Encode};
#[cfg(feature = "std")]
use serde::{Deserialize, Serialize};
#[cfg(feature = "std")]
use strum_macros::EnumIter;

/// Defines well-known working groups.
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize, EnumIter))]
#[derive(Encode, Decode, Clone, PartialEq, Eq, Copy, Debug)]
pub enum WorkingGroup {
/* Reserved
Expand All @@ -12,4 +14,6 @@ pub enum WorkingGroup {
*/
/// Storage working group: working_group::Instance2.
Storage,
/// Storage working group: working_group::Instance3.
Content,
}
4 changes: 2 additions & 2 deletions runtime-modules/content-directory/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2554,9 +2554,9 @@ impl<T: Trait> Module<T> {
maximum_entities_count: T::EntityId,
default_entity_creation_voucher_upper_bound: T::EntityId,
) -> Result<(), Error<T>> {
// Ensure `per_controller_entities_creation_limit` does not exceed
// Ensure default_entity_creation_voucher_upper_bound does not exceed default_entity_creation_voucher_upper_bound
ensure!(
default_entity_creation_voucher_upper_bound < maximum_entities_count,
default_entity_creation_voucher_upper_bound <= maximum_entities_count,
Error::<T>::PerControllerEntitiesCreationLimitExceedsOverallLimit
);

Expand Down
Loading