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

Governance 2 (Part 1, Non-Controversial Changes) #5892

Merged
merged 4 commits into from
Aug 16, 2022

Conversation

shawntabrizi
Copy link
Member

Breaking apart some of the changes from: #5205

These should be all non-controversial changes, and refactors the exact governance changes from master, making it easier to audit the changes from the #5205.

@shawntabrizi shawntabrizi added B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit. labels Aug 16, 2022
@github-actions github-actions bot added the A0-please_review Pull request needs code review. label Aug 16, 2022
@paritytech-ci paritytech-ci requested review from a team August 16, 2022 17:45
Comment on lines +1 to +4
// Copyright 2022 Parity Technologies (UK) Ltd.
// This file is part of Polkadot.

// Polkadot is free software: you can redistribute it and/or modify
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is exactly copy and paste from the existing runtime configuration.

runtime/kusama/src/governance/mod.rs Outdated Show resolved Hide resolved
runtime/kusama/src/governance/old.rs Outdated Show resolved Hide resolved
@@ -253,8 +253,8 @@ where
}

#[cfg(feature = "runtime-benchmarks")]
fn successful_origin() -> Origin {
Origin::root()
fn try_successful_origin() -> Result<Origin, ()> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this renamed in substrate?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}

for i in 0 .. max_people {
let leaser = account("lease_deposit", i, 0);
assert_eq!(T::Currency::reserved_balance(&leaser), T::Currency::minimum_balance());
}

}: _(RawOrigin::Root, para)
let origin = T::ForceOrigin::successful_origin();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here it is again without try?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is try_successful_origin and successful_origin, which is automatically implemented as try_successful_origin().unwrap().

In this case, we need the successful origin

@paritytech-ci paritytech-ci requested a review from a team August 16, 2022 19:17
shawntabrizi and others added 2 commits August 16, 2022 20:20
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
@shawntabrizi
Copy link
Member Author

bot merge

@paritytech-processbot paritytech-processbot bot merged commit f000f3a into master Aug 16, 2022
@paritytech-processbot paritytech-processbot bot deleted the shawntabrizi-gov2-part1 branch August 16, 2022 20:33
ordian added a commit that referenced this pull request Aug 29, 2022
* master: (23 commits)
  Bump futures-util from 0.3.21 to 0.3.23 (#5922)
  Companion for 12095 (#5924)
  use generated preimage weight (#5904)
  Update Substrate to make companion check happy (#5934)
  Fix wrong logic. (#5931)
  update weights (#5911)
  Clean up MigrateToV10 (#5921)
  Bump async-trait from 0.1.56 to 0.1.57 (#5919)
  Send back empty votes + log in approval-voting in case candidate entry is missing. (#5925)
  chore: bump zombienet version (#5914)
  Bump indexmap from 1.9.0 to 1.9.1 (#5918)
  Bump proc-macro2 from 1.0.40 to 1.0.43 (#5878)
  Bump hyper from 0.14.19 to 0.14.20 (#5901)
  Fix output file for updating weights in run_benches_for_runtime.sh (#5906)
  Companion to Substrate PR 12006 (#5913)
  pin gha versions (#5916)
  Companion for new Trie cache (#5897)
  [ci] Add check-runtime-migration job (#5891)
  Governance 2 (Part 1, Non-Controversial Changes) (#5892)
  Added Dwellir bootnodes for Kusama and Polkadot (#5772)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants