membership module

Cargo.toml

@@ -75,11 +75,11 @@ rev = 'df5e65927780b323482e2e8b5031822f423a032d'
 
 [dependencies.parity-codec]
 default-features = false
-version = '3.0'
+version = '3.1'
 
 [dependencies.parity-codec-derive]
 default-features = false
-version = '3.0'
+version = '3.1'
 
 [dependencies.primitives]
 default_features = false

src/governance/election.rs

@@ -17,10 +17,14 @@ use super::sealed_vote::SealedVote;
 pub use super::{ GovernanceCurrency, BalanceOf };
 use super::council;
 
+use crate::traits::{IsActiveMember};
+
 pub trait Trait: system::Trait + council::Trait + GovernanceCurrency {
     type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
 
     type CouncilElected: CouncilElected<Seats<Self::AccountId, BalanceOf<Self>>, Self::BlockNumber>;
+
+    type IsActiveMember: IsActiveMember<Self>;
 }
 
 #[derive(Clone, Copy, Encode, Decode)]
@@ -148,9 +152,9 @@ impl<T: Trait> Module<T> {
         <system::Module<T>>::block_number() + length
     }
 
-    // TODO This method should be moved to Membership module once it's created.
-    fn is_member(sender: T::AccountId) -> bool {
-        !T::Currency::free_balance(&sender).is_zero()
+
+    fn can_participate(sender: &T::AccountId) -> bool {
+        !T::Currency::free_balance(sender).is_zero() && T::IsActiveMember::is_active_member(sender)
     }
 
     // PUBLIC IMMUTABLES
@@ -651,7 +655,7 @@ decl_module! {
         // Member can make subsequent calls during announcing stage to increase their stake.
         fn apply(origin, stake: BalanceOf<T>) {
             let sender = ensure_signed(origin)?;
-            ensure!(Self::is_member(sender.clone()), "Only members can apply to be on council");
+            ensure!(Self::can_participate(&sender), "Only members can apply to be on council");
 
             let stage = Self::stage();
             ensure!(Self::stage().is_some(), "election not running");
@@ -674,7 +678,7 @@ decl_module! {
 
         fn vote(origin, commitment: T::Hash, stake: BalanceOf<T>) {
             let sender = ensure_signed(origin)?;
-            ensure!(Self::is_member(sender.clone()), "Only members can vote for an applicant");
+            ensure!(Self::can_participate(&sender), "Only members can vote for an applicant");
 
             let stage = Self::stage();
             ensure!(Self::stage().is_some(), "election not running");

src/governance/mock.rs

@@ -3,6 +3,7 @@
 use rstd::prelude::*;
 pub use super::{election, council, proposals, GovernanceCurrency};
 pub use system;
+use crate::traits;
 
 pub use primitives::{H256, Blake2Hasher};
 pub use runtime_primitives::{
@@ -17,6 +18,16 @@ impl_outer_origin! {
     pub enum Origin for Test {}
 }
 
+pub struct AnyAccountIsMember {}
+impl<T: system::Trait> traits::IsActiveMember<T> for AnyAccountIsMember {
+    fn is_active_member(who: &T::AccountId) -> bool {
+        true
+    }
+}
+
+// default trait implementation - any account is not a member
+// impl<T: system::Trait> traits::IsActiveMember<T> for () {}
+
 // For testing the module, we construct most of a mock runtime. This means
 // first constructing a configuration type (`Test`) which `impl`s each of the
 // configuration traits of modules we want to use.
@@ -53,10 +64,10 @@ impl election::Trait for Test {
     type Event = ();
 
     type CouncilElected = (Council,);
+
+    type IsActiveMember = AnyAccountIsMember;
 }
-impl proposals::Trait for Test {
-    type Event = ();
-}
+
 impl balances::Trait for Test {
     type Event = ();
 
@@ -92,6 +103,5 @@ pub fn initial_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
 
 pub type Election = election::Module<Test>;
 pub type Council = council::Module<Test>;
-pub type Proposals = proposals::Module<Test>;
 pub type System = system::Module<Test>;
 pub type Balances = balances::Module<Test>;

src/governance/proposals.rs

@@ -8,6 +8,7 @@ use rstd::prelude::*;
 
 use super::council;
 pub use super::{ GovernanceCurrency, BalanceOf };
+use crate::traits::{IsActiveMember};
 
 const DEFAULT_APPROVAL_QUORUM: u32 = 60;
 const DEFAULT_MIN_STAKE: u64 = 100;
@@ -115,6 +116,8 @@ pub struct TallyResult<BlockNumber> {
 pub trait Trait: timestamp::Trait + council::Trait + GovernanceCurrency {
     /// The overarching event type.
     type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
+
+    type IsActiveMember: IsActiveMember<Self>;
 }
 
 decl_event!(
@@ -221,7 +224,7 @@ decl_module! {
         ) {
 
             let proposer = ensure_signed(origin)?;
-            ensure!(Self::is_member(proposer.clone()), MSG_ONLY_MEMBERS_CAN_PROPOSE);
+            ensure!(Self::can_participate(proposer.clone()), MSG_ONLY_MEMBERS_CAN_PROPOSE);
             ensure!(stake >= Self::min_stake(), MSG_STAKE_IS_TOO_LOW);
 
             ensure!(!name.is_empty(), MSG_EMPTY_NAME_PROVIDED);
@@ -345,9 +348,8 @@ impl<T: Trait> Module<T> {
         <system::Module<T>>::block_number()
     }
 
-    // TODO This method should be moved to Membership module once it's created.
-    fn is_member(sender: T::AccountId) -> bool {
-        !T::Currency::free_balance(&sender).is_zero()
+    fn can_participate(sender: T::AccountId) -> bool {
+        !T::Currency::free_balance(&sender).is_zero() && T::IsActiveMember::is_active_member(&sender)
     }
 
     fn is_councilor(sender: &T::AccountId) -> bool {
@@ -613,6 +615,14 @@ mod tests {
 
     impl Trait for Test {
         type Event = ();
+        type IsActiveMember = AnyAccountIsMember;
+    }
+
+    pub struct AnyAccountIsMember {}
+    impl<T: system::Trait> IsActiveMember<T> for AnyAccountIsMember {
+        fn is_active_member(who: &T::AccountId) -> bool {
+            true
+        }
     }
 
     type System = system::Module<Test>;

src/lib.rs

@@ -17,14 +17,18 @@ extern crate parity_codec_derive;
 pub mod governance;
 use governance::{election, council, proposals};
 mod memo;
+mod membership;
+use membership::members;
+mod traits;
+mod migration;
 
 use rstd::prelude::*;
 #[cfg(feature = "std")]
 use primitives::bytes;
 use primitives::{Ed25519AuthorityId, OpaqueMetadata};
 use runtime_primitives::{
 	ApplyResult, transaction_validity::TransactionValidity, Ed25519Signature, generic,
-	traits::{self, Convert, BlakeTwo256, Block as BlockT, StaticLookup}, create_runtime_str
+	traits::{self as runtime_traits, Convert, BlakeTwo256, Block as BlockT, StaticLookup}, create_runtime_str
 };
 use client::{
 	block_builder::api::{CheckInherentsResult, InherentData, self as block_builder_api},
@@ -67,7 +71,7 @@ pub mod opaque {
 	#[derive(PartialEq, Eq, Clone, Default, Encode, Decode)]
 	#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
 	pub struct UncheckedExtrinsic(#[cfg_attr(feature = "std", serde(with="bytes"))] pub Vec<u8>);
-	impl traits::Extrinsic for UncheckedExtrinsic {
+	impl runtime_traits::Extrinsic for UncheckedExtrinsic {
 		fn is_signed(&self) -> Option<bool> {
 			None
 		}
@@ -87,7 +91,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("joystream-node"),
 	impl_name: create_runtime_str!("joystream-node"),
 	authoring_version: 3,
-	spec_version: 4,
+	spec_version: 5,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 };
@@ -208,11 +212,13 @@ impl governance::GovernanceCurrency for Runtime {
 
 impl governance::proposals::Trait for Runtime {
 	type Event = Event;
+	type IsActiveMember = Members;
 }
 
 impl governance::election::Trait for Runtime {
 	type Event = Event;
 	type CouncilElected = (Council,);
+	type IsActiveMember = Members;
 }
 
 impl governance::council::Trait for Runtime {
@@ -224,6 +230,17 @@ impl memo::Trait for Runtime {
 	type Event = Event;
 }
 
+impl members::Trait for Runtime {
+	type Event = Event;
+	type MemberId = u64;
+	type PaidTermId = u64;
+	type SubscriptionId = u64;
+}
+
+impl migration::Trait for Runtime {
+	type Event = Event;
+}
+
 construct_runtime!(
 	pub enum Runtime with Log(InternalLog: DigestItem<Hash, Ed25519AuthorityId>) where
 		Block = Block,
@@ -244,6 +261,8 @@ construct_runtime!(
 		CouncilElection: election::{Module, Call, Storage, Event<T>, Config<T>},
 		Council: council::{Module, Call, Storage, Event<T>, Config<T>},
 		Memo: memo::{Module, Call, Storage, Event<T>},
+		Members: members::{Module, Call, Storage, Event<T>, Config<T>},
+		Migration: migration::{Module, Call, Storage, Event<T>},
 	}
 );