runtime: Restore tests.

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

@@ -178,6 +178,7 @@ impl membership::Trait for Test {
     type MemberId = TestMemberId;
     type PaidTermId = u64;
     type SubscriptionId = u64;
+    type ActorId = u64;
     type InitialMembersBalance = InitialMembersBalance;
 }
 

runtime-modules/governance/src/mock.rs

@@ -67,6 +67,7 @@ impl membership::Trait for Test {
     type MemberId = u32;
     type SubscriptionId = u32;
     type PaidTermId = u32;
+    type ActorId = u32;
     type InitialMembersBalance = InitialMembersBalance;
 }
 impl minting::Trait for Test {

runtime-modules/membership/src/mock.rs

@@ -89,6 +89,7 @@ impl Trait for Test {
     type MemberId = u32;
     type PaidTermId = u32;
     type SubscriptionId = u32;
+    type ActorId = u32;
     type InitialMembersBalance = InitialMembersBalance;
 }
 

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

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

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

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

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

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

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

@@ -23,6 +23,10 @@ mod working_group_mod {
     pub use working_group::Event;
 }
 
+mod members {
+    pub use membership::Event;
+}
+
 impl_outer_origin! {
     pub enum Origin for Test {}
 }

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

@@ -464,11 +464,9 @@ pub fn setup_members(count: u8) {
         Membership::add_screened_member(
             RawOrigin::Signed(authority_account_id).into(),
             account_id,
-            membership::UserInfo {
-                handle: Some(handle.to_vec()),
-                avatar_uri: None,
-                about: None,
-            },
+            Some(handle.to_vec()),
+            None,
+            None,
         )
         .unwrap();
     }
@@ -775,7 +773,6 @@ impl EventFixture {
             u64,
             u64,
             u64,
-            u64,
             std::collections::BTreeMap<u64, u64>,
             Vec<u8>,
             u64,

runtime/src/integration/proposals/council_origin_validator.rs

@@ -45,7 +45,6 @@ mod tests {
     use super::CouncilManager;
     use crate::Runtime;
     use common::origin::ActorOriginValidator;
-    use membership::UserInfo;
     use proposals_engine::VotersParameters;
     use sr_primitives::AccountId32;
     use system::RawOrigin;
@@ -101,11 +100,9 @@ mod tests {
             Membership::add_screened_member(
                 RawOrigin::Signed(authority_account_id).into(),
                 account_id.clone(),
-                UserInfo {
-                    handle: Some(b"handle".to_vec()),
-                    avatar_uri: None,
-                    about: None,
-                },
+                Some(b"handle".to_vec()),
+                None,
+                None,
             )
             .unwrap();
             let member_id = 0; // newly created member_id
@@ -133,11 +130,9 @@ mod tests {
             Membership::add_screened_member(
                 RawOrigin::Signed(authority_account_id).into(),
                 account_id.clone(),
-                UserInfo {
-                    handle: Some(b"handle".to_vec()),
-                    avatar_uri: None,
-                    about: None,
-                },
+                Some(b"handle".to_vec()),
+                None,
+                None,
             )
             .unwrap();
             let member_id = 0; // newly created member_id
@@ -168,11 +163,9 @@ mod tests {
             Membership::add_screened_member(
                 RawOrigin::Signed(authority_account_id).into(),
                 account_id,
-                UserInfo {
-                    handle: Some(b"handle".to_vec()),
-                    avatar_uri: None,
-                    about: None,
-                },
+                Some(b"handle".to_vec()),
+                None,
+                None,
             )
             .unwrap();
             let member_id = 0; // newly created member_id

runtime/src/integration/proposals/membership_origin_validator.rs

@@ -47,7 +47,6 @@ mod tests {
     use super::MembershipOriginValidator;
     use crate::Runtime;
     use common::origin::ActorOriginValidator;
-    use membership::UserInfo;
     use sr_primitives::AccountId32;
     use system::RawOrigin;
 

runtime/src/tests/proposals_integration/mod.rs

@@ -42,11 +42,9 @@ fn setup_members(count: u8) {
         Membership::add_screened_member(
             RawOrigin::Signed(authority_account_id.clone().into()).into(),
             account_id.clone().into(),
-            membership::UserInfo {
-                handle: Some(account_id.to_vec()),
-                avatar_uri: None,
-                about: None,
-            },
+            Some(account_id.to_vec()),
+            None,
+            None,
         )
         .unwrap();
     }