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

Companion for #7536 (Pallet Treasury Refactor) (try 2) #2116

Closed
shawntabrizi wants to merge 9 commits into from
Closed

Companion for #7536 (Pallet Treasury Refactor) (try 2) #2116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ef081eb
wk2048 | D6 | issue-7143-treasury-refactor | integration
shamb0 Nov 27, 2020
fdffa1c
wk2048 | D6 | issue-7143-treasury-refactor | integration | p2
shamb0 Nov 27, 2020
c44ccda
Merge branch 'master' into pr/2025
shawntabrizi Nov 30, 2020
88a60d7
trait -> config
shawntabrizi Nov 30, 2020
9854a71
Merge branch 'master' into pr/2025
shawntabrizi Dec 1, 2020
e637fa8
Merge branch 'master' into pr/2025
shawntabrizi Dec 15, 2020
8144735
fix weight files and import
shawntabrizi Dec 15, 2020
4ebb981
missed some
shawntabrizi Dec 15, 2020
be23740
ping
shawntabrizi Dec 15, 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
trait -> config
  • Loading branch information
@shawntabrizi
shawntabrizi committed Nov 30, 2020
commit 88a60d76ff3bca88652449faf29321cd0a144bb3
4 changes: 2 additions & 2 deletions runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ impl pallet_treasury::Config for Runtime {
// type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
}

impl pallet_bounties::Trait for Runtime {
impl pallet_bounties::Config for Runtime {
type Event = Event;
type BountyDepositBase = BountyDepositBase;
type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
Expand All @@ -561,7 +561,7 @@ impl pallet_bounties::Trait for Runtime {

}

impl pallet_tips::Trait for Runtime {
impl pallet_tips::Config for Runtime {
type Event = Event;
type Tippers = ElectionsPhragmen;
type TipCountdown = TipCountdown;
Expand Down
2 changes: 1 addition & 1 deletion runtime/kusama/src/weights/pallet_bounties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub trait WeightInfo {

/// Weights for pallet_bounties using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
fn propose_bounty(d: u32, ) -> Weight {
(59_931_000 as Weight)
.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
Expand Down
2 changes: 1 addition & 1 deletion runtime/kusama/src/weights/pallet_tips.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pub trait WeightInfo {

/// Weights for pallet_tips using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
fn report_awesome(r: u32, ) -> Weight {
(70_338_000 as Weight)
.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
Expand Down
2 changes: 1 addition & 1 deletion runtime/kusama/src/weights/pallet_treasury.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub trait WeightInfo {

/// Weights for pallet_treasury using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
fn propose_spend() -> Weight {
(55_957_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
Expand Down
4 changes: 2 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 @@ -596,7 +596,7 @@ impl pallet_treasury::Config for Runtime {
// type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
}

impl pallet_bounties::Trait for Runtime {
impl pallet_bounties::Config for Runtime {
type Event = Event;
type BountyDepositBase = BountyDepositBase;
type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
Expand All @@ -607,7 +607,7 @@ impl pallet_bounties::Trait for Runtime {
// type WeightInfo = weights::pallet_bounties::WeightInfo<Runtime>;
}

impl pallet_tips::Trait for Runtime {
impl pallet_tips::Config for Runtime {
type Event = Event;
type Tippers = ElectionsPhragmen;
type TipCountdown = TipCountdown;
Expand Down
2 changes: 1 addition & 1 deletion runtime/polkadot/src/weights/pallet_bounties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub trait WeightInfo {

/// Weights for pallet_bounties using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
fn propose_bounty(d: u32, ) -> Weight {
(59_931_000 as Weight)
.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
Expand Down
2 changes: 1 addition & 1 deletion runtime/polkadot/src/weights/pallet_tips.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pub trait WeightInfo {

/// Weights for pallet_tips using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
fn report_awesome(r: u32, ) -> Weight {
(70_338_000 as Weight)
.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
Expand Down
2 changes: 1 addition & 1 deletion runtime/polkadot/src/weights/pallet_treasury.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub trait WeightInfo {

/// Weights for pallet_treasury using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
fn propose_spend() -> Weight {
(55_957_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
Expand Down