Skip to content

Commit

Permalink
simplifications part 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuaniRios
JuaniRios committed Jul 22, 2024
1 parent b978734 commit 43f19cf
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 50 deletions.
4 changes: 2 additions & 2 deletions pallets/funding/src/benchmarking.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1884,7 +1884,7 @@ mod benchmarks {
// Instead of advancing in time for the automatic `do_evaluation_end` call in on_initialize, we call it directly to benchmark it
#[block]
{
Pallet::<T>::do_evaluation_end(project_id).unwrap();
Pallet::<T>::do_end_evaluation(project_id).unwrap();
}

// * validity checks *
Expand Down Expand Up @@ -1945,7 +1945,7 @@ mod benchmarks {
// Instead of advancing in time for the automatic `do_evaluation_end` call in on_initialize, we call it directly to benchmark it
#[block]
{
Pallet::<T>::do_evaluation_end(project_id).unwrap();
Pallet::<T>::do_end_evaluation(project_id).unwrap();
}

// * validity checks *
Expand Down
4 changes: 2 additions & 2 deletions pallets/funding/src/functions/2_evaluation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl<T: Config> Pallet<T> {
///
/// # Next step
/// Users will pond PLMC for this project, and when the time comes, the project will be transitioned
/// to the next round by `on_initialize` using [`do_evaluation_end`](Self::do_evaluation_end)
/// to the next round by `on_initialize` using [`do_evaluation_end`](Self::do_end_evaluation)
#[transactional]
pub fn do_start_evaluation(caller: AccountIdOf<T>, project_id: ProjectId) -> DispatchResult {
// * Get variables *
Expand Down Expand Up @@ -71,7 +71,7 @@ impl<T: Config> Pallet<T> {
/// * Bonding failed - `on_idle` at some point checks for failed evaluation projects, and
/// unbonds the evaluators funds.
#[transactional]
pub fn do_evaluation_end(project_id: ProjectId) -> DispatchResult {
pub fn do_end_evaluation(project_id: ProjectId) -> DispatchResult {
// * Get variables *
let project_details = ProjectsDetails::<T>::get(project_id).ok_or(Error::<T>::ProjectDetailsNotFound)?;

Expand Down
85 changes: 39 additions & 46 deletions pallets/funding/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -860,20 +860,8 @@ pub mod pallet {
Self::do_start_evaluation(account, project_id)
}

/// Starts the auction round for a project. From the next block forward, any professional or
/// institutional user can set bids for a token_amount/token_price pair.
/// Any bids from this point until the auction_closing starts, will be considered as valid.
#[pallet::call_index(4)]
#[pallet::weight(WeightInfoOf::<T>::start_auction_manually(1))]
pub fn start_auction(origin: OriginFor<T>, jwt: UntrustedToken, project_id: ProjectId) -> DispatchResult {
let (account, _did, investor_type, _cid) =
T::InvestorOrigin::ensure_origin(origin, &jwt, T::VerifierPublicKey::get())?;
ensure!(investor_type == InvestorType::Institutional, Error::<T>::WrongInvestorType);
Self::do_start_auction(account, project_id)
}

/// Bond PLMC for a project in the evaluation stage
#[pallet::call_index(5)]
#[pallet::call_index(4)]
#[pallet::weight(
WeightInfoOf::<T>::evaluation(T::MaxEvaluationsPerUser::get() - 1)
)]
Expand All @@ -889,24 +877,29 @@ pub mod pallet {
Self::do_evaluate(&account, project_id, usd_amount, did, investor_type, whitelisted_policy)
}

#[pallet::call_index(6)]
#[pallet::call_index(5)]
#[pallet::weight(WeightInfoOf::<T>::end_evaluation_success(
1,
))]
pub fn root_do_evaluation_end(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResult {
ensure_root(origin)?;
Self::do_evaluation_end(project_id)
pub fn end_evaluation(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResult {
ensure_signed(origin)?;
Self::do_end_evaluation(project_id)
}

#[pallet::call_index(7)]
/// Starts the auction round for a project. From the next block forward, any professional or
/// institutional user can set bids for a token_amount/token_price pair.
/// Any bids from this point until the auction_closing starts, will be considered as valid.
#[pallet::call_index(6)]
#[pallet::weight(WeightInfoOf::<T>::start_auction_manually(1))]
pub fn root_do_auction_opening(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResult {
ensure_root(origin)?;
Self::do_start_auction(T::PalletId::get().into_account_truncating(), project_id)
pub fn start_auction(origin: OriginFor<T>, jwt: UntrustedToken, project_id: ProjectId) -> DispatchResult {
let (account, _did, investor_type, _cid) =
T::InvestorOrigin::ensure_origin(origin, &jwt, T::VerifierPublicKey::get())?;
ensure!(investor_type == InvestorType::Institutional, Error::<T>::WrongInvestorType);
Self::do_start_auction(account, project_id)
}

/// Bid for a project in the Auction round
#[pallet::call_index(8)]
#[pallet::call_index(7)]
#[pallet::weight(
WeightInfoOf::<T>::bid(
<T as Config>::MaxBidsPerUser::get() - 1,
Expand All @@ -929,7 +922,7 @@ pub mod pallet {
Self::do_bid(&account, project_id, ct_amount, multiplier, asset, did, investor_type, whitelisted_policy)
}

#[pallet::call_index(10)]
#[pallet::call_index(8)]
#[pallet::weight(WeightInfoOf::<T>::end_auction_closing(
1,
<T as Config>::MaxBidsPerProject::get() / 2,
Expand All @@ -945,13 +938,13 @@ pub mod pallet {
0u32,
<T as Config>::MaxBidsPerProject::get(),
)))]
pub fn root_do_end_auction(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResultWithPostInfo {
ensure_root(origin)?;
pub fn end_auction(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResultWithPostInfo {
ensure_signed(origin)?;
Self::do_end_auction(project_id)
}

/// Buy tokens in the Community or Remainder round at the price set in the Auction Round
#[pallet::call_index(12)]
#[pallet::call_index(9)]
#[pallet::weight(
WeightInfoOf::<T>::contribution(T::MaxContributionsPerUser::get() - 1)
)]
Expand All @@ -969,28 +962,28 @@ pub mod pallet {
Self::do_contribute(&account, project_id, amount, multiplier, asset, did, investor_type, whitelisted_policy)
}

#[pallet::call_index(15)]
#[pallet::call_index(10)]
#[pallet::weight(WeightInfoOf::<T>::end_funding_automatically_rejected_evaluators_slashed(
1,
)
.max(WeightInfoOf::<T>::end_funding_automatically_accepted_evaluators_rewarded(
1,
<T as Config>::MaxEvaluationsPerProject::get(),
)))]
pub fn root_do_end_funding(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResultWithPostInfo {
ensure_root(origin)?;
pub fn end_funding(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResultWithPostInfo {
ensure_signed(origin)?;
Self::do_end_funding(project_id)
}

#[pallet::call_index(18)]
#[pallet::call_index(11)]
#[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 {
ensure_root(origin)?;
pub fn start_settlement(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResultWithPostInfo {
ensure_signed(origin)?;
Self::do_start_settlement(project_id)
}

#[pallet::call_index(19)]
#[pallet::call_index(12)]
#[pallet::weight(WeightInfoOf::<T>::settle_successful_evaluation())]
pub fn settle_successful_evaluation(
origin: OriginFor<T>,
Expand All @@ -1004,7 +997,7 @@ pub mod pallet {
Self::do_settle_successful_evaluation(bid, project_id)
}

#[pallet::call_index(20)]
#[pallet::call_index(13)]
#[pallet::weight(WeightInfoOf::<T>::settle_successful_bid())]
pub fn settle_successful_bid(
origin: OriginFor<T>,
Expand All @@ -1017,7 +1010,7 @@ pub mod pallet {
Self::do_settle_successful_bid(bid, project_id)
}

#[pallet::call_index(21)]
#[pallet::call_index(14)]
#[pallet::weight(WeightInfoOf::<T>::settle_successful_contribution())]
pub fn settle_successful_contribution(
origin: OriginFor<T>,
Expand All @@ -1031,7 +1024,7 @@ pub mod pallet {
Self::do_settle_successful_contribution(bid, project_id)
}

#[pallet::call_index(22)]
#[pallet::call_index(15)]
#[pallet::weight(WeightInfoOf::<T>::settle_failed_evaluation())]
pub fn settle_failed_evaluation(
origin: OriginFor<T>,
Expand All @@ -1045,7 +1038,7 @@ pub mod pallet {
Self::do_settle_failed_evaluation(bid, project_id)
}

#[pallet::call_index(23)]
#[pallet::call_index(16)]
#[pallet::weight(WeightInfoOf::<T>::settle_failed_bid())]
pub fn settle_failed_bid(
origin: OriginFor<T>,
Expand All @@ -1058,7 +1051,7 @@ pub mod pallet {
Self::do_settle_failed_bid(bid, project_id)
}

#[pallet::call_index(24)]
#[pallet::call_index(17)]
#[pallet::weight(WeightInfoOf::<T>::settle_failed_contribution())]
pub fn settle_failed_contribution(
origin: OriginFor<T>,
Expand All @@ -1072,7 +1065,7 @@ pub mod pallet {
Self::do_settle_failed_contribution(bid, project_id)
}

#[pallet::call_index(25)]
#[pallet::call_index(18)]
#[pallet::weight(WeightInfoOf::<T>::start_pallet_migration())]
pub fn start_pallet_migration(
origin: OriginFor<T>,
Expand All @@ -1087,7 +1080,7 @@ pub mod pallet {
Self::do_start_pallet_migration(&account, project_id, para_id)
}

#[pallet::call_index(26)]
#[pallet::call_index(19)]
#[pallet::weight(WeightInfoOf::<T>::start_offchain_migration())]
pub fn start_offchain_migration(
origin: OriginFor<T>,
Expand All @@ -1101,7 +1094,7 @@ pub mod pallet {
Self::do_start_offchain_migration(project_id, account)
}

#[pallet::call_index(27)]
#[pallet::call_index(20)]
#[pallet::weight(WeightInfoOf::<T>::start_pallet_migration_readiness_check())]
pub fn start_pallet_migration_readiness_check(
origin: OriginFor<T>,
Expand All @@ -1115,7 +1108,7 @@ pub mod pallet {
}

/// Called only by other chains through a query response xcm message
#[pallet::call_index(28)]
#[pallet::call_index(21)]
#[pallet::weight(WeightInfoOf::<T>::pallet_migration_readiness_response_pallet_info()
.max(WeightInfoOf::<T>::pallet_migration_readiness_response_holding()))]
pub fn pallet_migration_readiness_response(
Expand All @@ -1128,7 +1121,7 @@ pub mod pallet {
Self::do_pallet_migration_readiness_response(location, query_id, response)
}

#[pallet::call_index(29)]
#[pallet::call_index(22)]
#[pallet::weight(WeightInfoOf::<T>::send_pallet_migration_for(MaxParticipationsPerUser::<T>::get()))]
pub fn send_pallet_migration_for(
origin: OriginFor<T>,
Expand All @@ -1139,7 +1132,7 @@ pub mod pallet {
Self::do_send_pallet_migration_for(project_id, participant)
}

#[pallet::call_index(30)]
#[pallet::call_index(23)]
#[pallet::weight(WeightInfoOf::<T>::confirm_pallet_migrations(MaxParticipationsPerUser::<T>::get()))]
pub fn confirm_pallet_migrations(
origin: OriginFor<T>,
Expand All @@ -1151,7 +1144,7 @@ pub mod pallet {
Self::do_confirm_pallet_migrations(location, query_id, response)
}

#[pallet::call_index(31)]
#[pallet::call_index(24)]
#[pallet::weight(WeightInfoOf::<T>::confirm_offchain_migration(MaxParticipationsPerUser::<T>::get()))]
pub fn confirm_offchain_migration(
origin: OriginFor<T>,
Expand All @@ -1163,7 +1156,7 @@ pub mod pallet {
Self::do_confirm_offchain_migration(project_id, caller, participant)
}

#[pallet::call_index(32)]
#[pallet::call_index(25)]
#[pallet::weight(WeightInfoOf::<T>::mark_project_ct_migration_as_finished())]
pub fn mark_project_ct_migration_as_finished(origin: OriginFor<T>, project_id: ProjectId) -> DispatchResult {
let _caller = ensure_signed(origin)?;
Expand Down

0 comments on commit 43f19cf

Please sign in to comment.