Skip to content
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

Jump to bottom

fix wrong fallback weight in on_initialize #328

Merged
merged 1 commit into from
Jun 24, 2024
Merged

fix wrong fallback weight in on_initialize #328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 29 additions & 8 deletions pallets/funding/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,14 +1164,14 @@ pub mod pallet {
Self::do_evaluation_end(project_id)
}

#[pallet::call_index(59)]
#[pallet::call_index(29)]
#[pallet::weight(WeightInfoOf::<T>::start_auction_manually(<T as Config>::MaxProjectsToUpdateInsertionAttempts::get() - 1))]
pub fn root_do_auction_opening(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResultWithPostInfo {
ensure_root(origin)?;
Self::do_start_auction_opening(T::PalletId::get().into_account_truncating(), project_id)
}

#[pallet::call_index(29)]
#[pallet::call_index(30)]
#[pallet::weight(WeightInfoOf::<T>::start_auction_closing_phase(
<T as Config>::MaxProjectsToUpdateInsertionAttempts::get() - 1,
))]
Expand All @@ -1183,7 +1183,28 @@ pub mod pallet {
Self::do_start_auction_closing(project_id)
}

#[pallet::call_index(30)]
#[pallet::call_index(31)]
#[pallet::weight(WeightInfoOf::<T>::end_auction_closing(
<T as Config>::MaxProjectsToUpdateInsertionAttempts::get() - 1,
<T as Config>::MaxBidsPerProject::get() / 2,
<T as Config>::MaxBidsPerProject::get() / 2,
)
.max(WeightInfoOf::<T>::end_auction_closing(
<T as Config>::MaxProjectsToUpdateInsertionAttempts::get() - 1,
<T as Config>::MaxBidsPerProject::get(),
0u32,
))
.max(WeightInfoOf::<T>::end_auction_closing(
<T as Config>::MaxProjectsToUpdateInsertionAttempts::get() - 1,
0u32,
<T as Config>::MaxBidsPerProject::get(),
)))]
pub fn root_do_end_auction_closing(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResultWithPostInfo {
ensure_root(origin)?;
Self::do_end_auction_closing(project_id)
}

#[pallet::call_index(32)]
#[pallet::weight(WeightInfoOf::<T>::start_community_funding(
<T as Config>::MaxProjectsToUpdateInsertionAttempts::get() - 1,
<T as Config>::MaxBidsPerProject::get() / 2,
Expand All @@ -1204,7 +1225,7 @@ pub mod pallet {
Self::do_start_community_funding(project_id)
}

#[pallet::call_index(31)]
#[pallet::call_index(33)]
#[pallet::weight(WeightInfoOf::<T>::start_remainder_funding(
<T as Config>::MaxProjectsToUpdateInsertionAttempts::get() - 1,
))]
Expand All @@ -1213,7 +1234,7 @@ pub mod pallet {
Self::do_start_remainder_funding(project_id)
}

#[pallet::call_index(32)]
#[pallet::call_index(34)]
#[pallet::weight(WeightInfoOf::<T>::end_funding_automatically_rejected_evaluators_slashed(
<T as Config>::MaxProjectsToUpdateInsertionAttempts::get() - 1,
)
Expand All @@ -1232,7 +1253,7 @@ pub mod pallet {
Self::do_end_funding(project_id)
}

#[pallet::call_index(33)]
#[pallet::call_index(36)]
lrazovic marked this conversation as resolved.
Show resolved Hide resolved
#[pallet::weight(WeightInfoOf::<T>::project_decision())]
pub fn root_do_project_decision(
origin: OriginFor<T>,
Expand All @@ -1243,7 +1264,7 @@ pub mod pallet {
Self::do_project_decision(project_id, decision)
}

#[pallet::call_index(34)]
#[pallet::call_index(37)]
#[pallet::weight(WeightInfoOf::<T>::start_settlement_funding_success()
.max(WeightInfoOf::<T>::start_settlement_funding_failure()))]
pub fn root_do_start_settlement(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResultWithPostInfo {
Expand Down Expand Up @@ -1306,7 +1327,7 @@ pub mod pallet {
UpdateType::AuctionClosingEnd => {
let call = Self::do_end_auction_closing(project_id);
let fallback_weight =
Call::<T>::root_do_start_auction_closing { project_id }.get_dispatch_info().weight;
Call::<T>::root_do_end_auction_closing { project_id }.get_dispatch_info().weight;
update_weight(&mut used_weight, call, fallback_weight);
},

Expand Down