|
@@ -74,8 +74,8 @@ type WeightInfoMembership<T> = <T as Trait>::WeightInfo;
|
|
|
/// pallet_forum WeightInfo.
|
|
|
/// Note: This was auto generated through the benchmark CLI using the `--weight-trait` flag
|
|
|
pub trait WeightInfo {
|
|
|
- fn buy_membership_without_referrer(i: u32, j: u32, k: u32, z: u32) -> Weight;
|
|
|
- fn buy_membership_with_referrer(i: u32, j: u32, k: u32, z: u32) -> Weight;
|
|
|
+ fn buy_membership_without_referrer(i: u32, j: u32) -> Weight;
|
|
|
+ fn buy_membership_with_referrer(i: u32, j: u32) -> Weight;
|
|
|
fn update_profile(i: u32) -> Weight;
|
|
|
fn update_accounts_none() -> Weight;
|
|
|
fn update_accounts_root() -> Weight;
|
|
@@ -83,7 +83,7 @@ pub trait WeightInfo {
|
|
|
fn update_accounts_both() -> Weight;
|
|
|
fn set_referral_cut() -> Weight;
|
|
|
fn transfer_invites() -> Weight;
|
|
|
- fn invite_member(i: u32, j: u32, k: u32, z: u32) -> Weight;
|
|
|
+ fn invite_member(i: u32, j: u32) -> Weight;
|
|
|
fn set_membership_price() -> Weight;
|
|
|
fn update_profile_verification() -> Weight;
|
|
|
fn set_leader_invitation_quota() -> Weight;
|
|
@@ -170,17 +170,11 @@ pub struct BuyMembershipParameters<AccountId, MemberId> {
|
|
|
/// New member controller account.
|
|
|
pub controller_account: AccountId,
|
|
|
|
|
|
- /// New member user name.
|
|
|
- pub name: Option<Vec<u8>>,
|
|
|
-
|
|
|
/// New member handle.
|
|
|
pub handle: Option<Vec<u8>>,
|
|
|
|
|
|
- /// New member avatar URI.
|
|
|
- pub avatar_uri: Option<Vec<u8>>,
|
|
|
-
|
|
|
- /// New member 'about' text.
|
|
|
- pub about: Option<Vec<u8>>,
|
|
|
+ /// Meta data concerning new member.
|
|
|
+ pub meta_data: Vec<u8>,
|
|
|
|
|
|
/// Referrer member id.
|
|
|
pub referrer_id: Option<MemberId>,
|
|
@@ -198,17 +192,11 @@ pub struct InviteMembershipParameters<AccountId, MemberId> {
|
|
|
/// New member controller account.
|
|
|
pub controller_account: AccountId,
|
|
|
|
|
|
- /// New member user name.
|
|
|
- pub name: Option<Vec<u8>>,
|
|
|
-
|
|
|
/// New member handle.
|
|
|
pub handle: Option<Vec<u8>>,
|
|
|
|
|
|
- /// New member avatar URI.
|
|
|
- pub avatar_uri: Option<Vec<u8>>,
|
|
|
-
|
|
|
- /// New member 'about' text.
|
|
|
- pub about: Option<Vec<u8>>,
|
|
|
+ /// Meta data concerning new member.
|
|
|
+ pub meta_data: Vec<u8>,
|
|
|
}
|
|
|
|
|
|
decl_error! {
|
|
@@ -339,8 +327,6 @@ decl_event! {
|
|
|
MemberId,
|
|
|
Option<Vec<u8>>,
|
|
|
Option<Vec<u8>>,
|
|
|
- Option<Vec<u8>>,
|
|
|
- Option<Vec<u8>>,
|
|
|
),
|
|
|
MemberAccountsUpdated(MemberId, Option<AccountId>, Option<AccountId>),
|
|
|
MemberVerificationStatusUpdated(MemberId, bool, ActorId),
|
|
@@ -417,7 +403,7 @@ decl_module! {
|
|
|
let _ = balances::Module::<T>::slash(&who, fee);
|
|
|
|
|
|
// Reward the referring member.
|
|
|
- if let Some(referrer) = referrer{
|
|
|
+ if let Some(referrer) = referrer {
|
|
|
let referral_cut: BalanceOf<T> = Self::get_referral_bonus();
|
|
|
|
|
|
if referral_cut > Zero::zero() {
|
|
@@ -451,13 +437,11 @@ decl_module! {
|
|
|
pub fn update_profile(
|
|
|
origin,
|
|
|
member_id: T::MemberId,
|
|
|
- name: Option<Vec<u8>>,
|
|
|
handle: Option<Vec<u8>>,
|
|
|
- avatar_uri: Option<Vec<u8>>,
|
|
|
- about: Option<Vec<u8>>
|
|
|
+ meta: Option<Vec<u8>>,
|
|
|
) {
|
|
|
// No effect if no changes.
|
|
|
- if name.is_none() && handle.is_none() && avatar_uri.is_none() && about.is_none() {
|
|
|
+ if handle.is_none() && meta.is_none() {
|
|
|
return Ok(())
|
|
|
}
|
|
|
|
|
@@ -485,10 +469,8 @@ decl_module! {
|
|
|
|
|
|
Self::deposit_event(RawEvent::MemberProfileUpdated(
|
|
|
member_id,
|
|
|
- name,
|
|
|
handle,
|
|
|
- avatar_uri,
|
|
|
- about
|
|
|
+ meta,
|
|
|
));
|
|
|
}
|
|
|
}
|
|
@@ -656,11 +638,10 @@ decl_module! {
|
|
|
/// - DB:
|
|
|
/// - O(V)
|
|
|
/// # </weight>
|
|
|
+ // TODO: adjust weight
|
|
|
#[weight = WeightInfoMembership::<T>::invite_member(
|
|
|
- Module::<T>::text_length_unwrap_or_default(¶ms.name),
|
|
|
Module::<T>::text_length_unwrap_or_default(¶ms.handle),
|
|
|
- Module::<T>::text_length_unwrap_or_default(¶ms.avatar_uri),
|
|
|
- Module::<T>::text_length_unwrap_or_default(¶ms.about),
|
|
|
+ params.meta_data.len().saturated_into(),
|
|
|
)]
|
|
|
pub fn invite_member(
|
|
|
origin,
|
|
@@ -942,22 +923,19 @@ impl<T: Trait> Module<T> {
|
|
|
}
|
|
|
|
|
|
// Helper for buy_membership extrinsic weight calculation
|
|
|
+ // TODO: adjust weight
|
|
|
fn calculate_weight_for_buy_membership(
|
|
|
params: &BuyMembershipParameters<T::AccountId, T::MemberId>,
|
|
|
) -> Weight {
|
|
|
if params.referrer_id.is_some() {
|
|
|
WeightInfoMembership::<T>::buy_membership_with_referrer(
|
|
|
- Self::text_length_unwrap_or_default(¶ms.name),
|
|
|
Self::text_length_unwrap_or_default(¶ms.handle),
|
|
|
- Self::text_length_unwrap_or_default(¶ms.avatar_uri),
|
|
|
- Self::text_length_unwrap_or_default(¶ms.about),
|
|
|
+ params.meta_data.len().saturated_into(),
|
|
|
)
|
|
|
} else {
|
|
|
WeightInfoMembership::<T>::buy_membership_without_referrer(
|
|
|
- Self::text_length_unwrap_or_default(¶ms.name),
|
|
|
Self::text_length_unwrap_or_default(¶ms.handle),
|
|
|
- Self::text_length_unwrap_or_default(¶ms.avatar_uri),
|
|
|
- Self::text_length_unwrap_or_default(¶ms.about),
|
|
|
+ params.meta_data.len().saturated_into(),
|
|
|
)
|
|
|
}
|
|
|
}
|