Skip to content

Proposals update. Parameters migration from the Storage to the Trait. #1680

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
mnaamani merged 27 commits into from
Nov 18, 2020
Merged

Proposals update. Parameters migration from the Storage to the Trait. #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
252e1b7
runtime: Start migrating proposals parameters.
shamil-gadelshin Oct 27, 2020
8b327e6
runtime: Add conditional compilation for the proposals parameters.
shamil-gadelshin Oct 29, 2020
146d455
runtime: Add comments and tests.
shamil-gadelshin Oct 29, 2020
003b5f9
runtime: Migrate ‘runtime upgrade’ proposal params.
shamil-gadelshin Nov 2, 2020
c09febc
runtime: Migrate ‘text’ proposal params.
shamil-gadelshin Nov 2, 2020
3614999
runtime: proposals: Bump pallets versions.
shamil-gadelshin Nov 2, 2020
22b88a9
runtime: Migrate ‘spending’ proposal params.
shamil-gadelshin Nov 3, 2020
b8a63a5
runtime: Migrate ‘add working group opening’ proposal params.
shamil-gadelshin Nov 3, 2020
14da8d7
runtime: Migrate ‘begin review working group applications’ proposal p…
shamil-gadelshin Nov 3, 2020
40e7eb5
runtime: Migrate ‘Fill working group opening’ proposal params.
shamil-gadelshin Nov 3, 2020
19f9aa4
runtime: Migrate ‘set working group mint capacity’ proposal params.
shamil-gadelshin Nov 3, 2020
944199a
runtime: Migrate ‘decrease working group leader stake’ proposal params.
shamil-gadelshin Nov 3, 2020
b29aaa7
runtime: Introduce proposal configuration macros.
shamil-gadelshin Nov 4, 2020
4de8a71
runtime: Add panic on invalid JSON env.
shamil-gadelshin Nov 4, 2020
93ea5f1
runtime: Format the code.
shamil-gadelshin Nov 5, 2020
bd8cbe3
Merge remote-tracking branch 'origin/proposals_update4' into proposal…
shamil-gadelshin Nov 11, 2020
4507d04
Merge branch 'proposals_update5' into proposals_update6
shamil-gadelshin Nov 11, 2020
0cff4fc
runtime: Fix proposals tests.
shamil-gadelshin Nov 11, 2020
c04cc3d
runtime: Refactor proposal params to use macro.
shamil-gadelshin Nov 11, 2020
15fae4a
runtime: Refactor ‘slash leader stake’ proposal parameters.
shamil-gadelshin Nov 11, 2020
b9f28b5
runtime: Refactor ‘set leader reward’ proposal parameters.
shamil-gadelshin Nov 11, 2020
6220e7a
runtime: Refactor ‘terminate leader role’ proposal params.
shamil-gadelshin Nov 11, 2020
aab86f8
Refactor proposal parameters.
shamil-gadelshin Nov 11, 2020
dd223d4
runtime: Wrap zero proposal parameter as None.
shamil-gadelshin Nov 11, 2020
9c3fe94
runtime: Add panic on invalid JSON parameter type.
shamil-gadelshin Nov 11, 2020
07730ff
runtime: proposals: Add proposal parameter constants.
shamil-gadelshin Nov 13, 2020
e74621e
Merge branch 'proposals_update' into proposals_update6
shamil-gadelshin Nov 17, 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
33 changes: 28 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.

59 changes: 3 additions & 56 deletions node/src/chain_spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ use node_runtime::{
ContentDirectoryConfig, ContentDirectoryWorkingGroupConfig, ContentWorkingGroupConfig,
CouncilConfig, CouncilElectionConfig, DataDirectoryConfig, DataObjectStorageRegistryConfig,
DataObjectTypeRegistryConfig, ElectionParameters, ForumConfig, GrandpaConfig, ImOnlineConfig,
MembersConfig, Moment, ProposalsCodexConfig, SessionConfig, SessionKeys, Signature,
StakerStatus, StakingConfig, StorageWorkingGroupConfig, SudoConfig, SystemConfig,
VersionedStoreConfig, VersionedStorePermissionsConfig, DAYS, WASM_BINARY,
MembersConfig, Moment, SessionConfig, SessionKeys, Signature, StakerStatus, StakingConfig,
StorageWorkingGroupConfig, SudoConfig, SystemConfig, VersionedStoreConfig,
VersionedStorePermissionsConfig, DAYS, WASM_BINARY,
};

// Exported to be used by chain-spec-builder
Expand All @@ -45,7 +45,6 @@ pub mod content_config;
pub mod forum_config;
pub mod initial_balances;
pub mod initial_members;
pub mod proposals_config;

type AccountPublic = <Signature as Verify>::Signer;

Expand Down Expand Up @@ -133,7 +132,6 @@ impl Alternative {
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
],
proposals_config::development(),
initial_members::none(),
forum_config::empty(get_account_id_from_seed::<sr25519::Public>("Alice")),
content_config::empty_versioned_store_config(),
Expand Down Expand Up @@ -174,7 +172,6 @@ impl Alternative {
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
],
proposals_config::development(),
initial_members::none(),
forum_config::empty(get_account_id_from_seed::<sr25519::Public>("Alice")),
content_config::empty_versioned_store_config(),
Expand Down Expand Up @@ -220,7 +217,6 @@ pub fn testnet_genesis(
)>,
root_key: AccountId,
endowed_accounts: Vec<AccountId>,
cpcp: node_runtime::ProposalsConfigParameters,
members: Vec<membership::genesis::Member<u64, AccountId, Moment>>,
forum_config: ForumConfig,
versioned_store_config: VersionedStoreConfig,
Expand Down Expand Up @@ -339,53 +335,6 @@ pub fn testnet_genesis(
versioned_store: Some(versioned_store_config),
versioned_store_permissions: Some(versioned_store_permissions_config),
content_wg: Some(content_working_group_config),
proposals_codex: Some(ProposalsCodexConfig {
set_validator_count_proposal_voting_period: cpcp
.set_validator_count_proposal_voting_period,
set_validator_count_proposal_grace_period: cpcp
.set_validator_count_proposal_grace_period,
runtime_upgrade_proposal_voting_period: cpcp.runtime_upgrade_proposal_voting_period,
runtime_upgrade_proposal_grace_period: cpcp.runtime_upgrade_proposal_grace_period,
text_proposal_voting_period: cpcp.text_proposal_voting_period,
text_proposal_grace_period: cpcp.text_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
.add_working_group_opening_proposal_voting_period,
add_working_group_opening_proposal_grace_period: cpcp
.add_working_group_opening_proposal_grace_period,
begin_review_working_group_leader_applications_proposal_voting_period: cpcp
.begin_review_working_group_leader_applications_proposal_voting_period,
begin_review_working_group_leader_applications_proposal_grace_period: cpcp
.begin_review_working_group_leader_applications_proposal_grace_period,
fill_working_group_leader_opening_proposal_voting_period: cpcp
.fill_working_group_leader_opening_proposal_voting_period,
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_working_group_mint_capacity_proposal_voting_period,
set_working_group_mint_capacity_proposal_grace_period: cpcp
.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
.decrease_working_group_leader_stake_proposal_grace_period,
slash_working_group_leader_stake_proposal_voting_period: cpcp
.slash_working_group_leader_stake_proposal_voting_period,
slash_working_group_leader_stake_proposal_grace_period: cpcp
.slash_working_group_leader_stake_proposal_grace_period,
set_working_group_leader_reward_proposal_voting_period: cpcp
.set_working_group_leader_reward_proposal_voting_period,
set_working_group_leader_reward_proposal_grace_period: cpcp
.set_working_group_leader_reward_proposal_grace_period,
terminate_working_group_leader_role_proposal_voting_period: cpcp
.terminate_working_group_leader_role_proposal_voting_period,
terminate_working_group_leader_role_proposal_grace_period: cpcp
.terminate_working_group_leader_role_proposal_grace_period,
amend_constitution_proposal_voting_period: cpcp
.amend_constitution_proposal_voting_period,
amend_constitution_proposal_grace_period: cpcp.amend_constitution_proposal_grace_period,
}),
}
}

Expand All @@ -400,7 +349,6 @@ pub(crate) mod tests {
vec![get_authority_keys_from_seed("Alice")],
get_account_id_from_seed::<sr25519::Public>("Alice"),
vec![get_authority_keys_from_seed("Alice").0],
proposals_config::development(),
initial_members::none(),
forum_config::empty(get_account_id_from_seed::<sr25519::Public>("Alice")),
content_config::empty_versioned_store_config(),
Expand Down Expand Up @@ -437,7 +385,6 @@ pub(crate) mod tests {
get_authority_keys_from_seed("Alice").0,
get_authority_keys_from_seed("Bob").0,
],
proposals_config::development(),
initial_members::none(),
forum_config::empty(get_account_id_from_seed::<sr25519::Public>("Alice")),
content_config::empty_versioned_store_config(),
Expand Down
17 changes: 0 additions & 17 deletions node/src/chain_spec/proposals_config.rs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion node/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
// along with Joystream node. If not, see <http://www.gnu.org/licenses/>.

#![warn(unused_extern_crates)]

// Substrate implementation issue.
#![allow(clippy::redundant_closure_call)]

Expand Down
2 changes: 1 addition & 1 deletion runtime-modules/proposals/codex/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = 'pallet-proposals-codex'
version = '3.0.0'
version = '4.0.0'
authors = ['Joystream contributors']
edition = '2018'

Expand Down
Loading