runtime: membership: Remove profile fields.

runtime-modules/governance/src/mock.rs

@@ -74,7 +74,6 @@ impl election::Trait for Test {
 impl membership::Trait for Test {
     type Event = ();
     type MemberId = u64;
-    type SubscriptionId = u32;
     type PaidTermId = u32;
     type ActorId = u32;
 }

runtime-modules/membership/src/lib.rs

@@ -46,15 +46,6 @@ pub trait Trait: frame_system::Trait + GovernanceCurrency + pallet_timestamp::Tr
         + MaybeSerialize
         + PartialEq;
 
-    type SubscriptionId: Parameter
-        + Member
-        + BaseArithmetic
-        + Codec
-        + Default
-        + Copy
-        + MaybeSerialize
-        + PartialEq;
-
     /// Describes the common type for the working group members (workers).
     type ActorId: Parameter
         + Member
@@ -83,13 +74,12 @@ pub type Membership<T> = MembershipObject<
     <T as frame_system::Trait>::BlockNumber,
     <T as pallet_timestamp::Trait>::Moment,
     <T as Trait>::PaidTermId,
-    <T as Trait>::SubscriptionId,
     <T as frame_system::Trait>::AccountId,
 >;
 
 #[derive(Encode, Decode, Default)]
 /// Stored information about a registered user
-pub struct MembershipObject<BlockNumber, Moment, PaidTermId, SubscriptionId, AccountId> {
+pub struct MembershipObject<BlockNumber, Moment, PaidTermId, AccountId> {
     /// The unique handle chosen by member
     pub handle: Vec<u8>,
 
@@ -108,12 +98,6 @@ pub struct MembershipObject<BlockNumber, Moment, PaidTermId, SubscriptionId, Acc
     /// How the member was registered
     pub entry: EntryMethod<PaidTermId, AccountId>,
 
-    /// Whether the member is suspended or not.
-    pub suspended: bool,
-
-    /// The type of subscription the member has purchased if any.
-    pub subscription: Option<SubscriptionId>,
-
     /// Member's root account id. Only the root account is permitted to set a new root account
     /// and update the controller account. Other modules may only allow certain actions if
     /// signed with root account. It is intended to be an account that can remain offline and
@@ -595,8 +579,6 @@ impl<T: Trait> Module<T> {
             registered_at_block,
             registered_at_time,
             entry: entry_method,
-            suspended: false,
-            subscription: None,
             root_account: root_account.clone(),
             controller_account: controller_account.clone(),
         };

runtime-modules/membership/src/mock.rs

@@ -86,7 +86,6 @@ impl Trait for Test {
     type Event = ();
     type MemberId = u64;
     type PaidTermId = u32;
-    type SubscriptionId = u32;
     type ActorId = u32;
 }
 

runtime-modules/proposals/codex/src/tests/mock.rs

@@ -49,7 +49,6 @@ impl membership::Trait for Test {
     type Event = ();
     type MemberId = u64;
     type PaidTermId = u64;
-    type SubscriptionId = u64;
     type ActorId = u64;
 }
 

runtime-modules/proposals/discussion/src/tests/mock.rs

@@ -77,7 +77,6 @@ impl membership::Trait for Test {
     type Event = TestEvent;
     type MemberId = u64;
     type PaidTermId = u64;
-    type SubscriptionId = u64;
     type ActorId = u64;
 }
 

runtime-modules/proposals/engine/src/tests/mock/mod.rs

@@ -84,7 +84,6 @@ impl membership::Trait for Test {
     type Event = TestEvent;
     type MemberId = u64;
     type PaidTermId = u64;
-    type SubscriptionId = u64;
     type ActorId = u64;
 }
 

runtime-modules/service-discovery/src/mock.rs

@@ -110,7 +110,6 @@ impl membership::Trait for Test {
     type Event = MetaEvent;
     type MemberId = u64;
     type PaidTermId = u64;
-    type SubscriptionId = u64;
     type ActorId = u64;
 }
 

runtime-modules/staking-handler/src/mock.rs

@@ -71,7 +71,6 @@ impl membership::Trait for Test {
     type Event = ();
     type MemberId = u64;
     type PaidTermId = u64;
-    type SubscriptionId = u64;
     type ActorId = u64;
 }
 

runtime-modules/storage/src/tests/mock.rs

@@ -201,7 +201,6 @@ impl data_object_storage_registry::Trait for Test {
 impl membership::Trait for Test {
     type Event = MetaEvent;
     type MemberId = u64;
-    type SubscriptionId = u32;
     type PaidTermId = u32;
     type ActorId = u32;
 }

runtime-modules/working-group/src/tests/mock.rs

@@ -98,7 +98,6 @@ impl membership::Trait for Test {
     type Event = TestEvent;
     type MemberId = u64;
     type PaidTermId = u64;
-    type SubscriptionId = u64;
     type ActorId = u64;
 }
 

runtime/src/lib.rs

@@ -242,7 +242,6 @@ parameter_types! {
     pub const ExistentialDeposit: u128 = 0;
     pub const TransferFee: u128 = 0;
     pub const CreationFee: u128 = 0;
-    pub const InitialMembersBalance: u32 = 2000;
     pub const MaxLocks: u32 = 50;
 }
 
@@ -524,13 +523,11 @@ impl membership::Trait for Runtime {
     type Event = Event;
     type MemberId = MemberId;
     type PaidTermId = u64;
-    type SubscriptionId = u64;
     type ActorId = ActorId;
 }
 
 parameter_types! {
     pub const MaxCategoryDepth: u64 = 5;
-
     pub const MaxSubcategories: u64 = 20;
     pub const MaxThreadsInCategory: u64 = 20;
     pub const MaxPostsInThread: u64 = 20;