Merge branch 'development' into fix/163

src/membership/members.rs

@@ -658,10 +658,15 @@ impl<T: Trait> Module<T> {
             "ActorInRoleAlreadyExists"
         );
 
+        /*
+        Disabling this temporarily for Rome, later we will drop all this
+        integration with Membership module anyway:
+        https://github.com/Joystream/substrate-runtime-joystream/issues/115
         ensure!(
             !profile.roles.occupies_role(actor_in_role.role),
             "MemberAlreadyInRole"
         );
+        */
 
         // Other possible checks:
         // How long the member has been registered

src/membership/tests.rs

@@ -374,7 +374,10 @@ fn registering_and_unregistering_roles_on_member() {
                 members::Role::ChannelOwner
             ));
 
-            // enter role a second time should fail
+            /*
+            Disabling this temporarily for Rome, later we will drop all this
+            integration with Membership module anyway:
+            https://github.com/Joystream/substrate-runtime-joystream/issues/115
             assert_dispatch_error_message(
                 Members::register_role_on_member(
                     member_id_1,
@@ -382,6 +385,7 @@ fn registering_and_unregistering_roles_on_member() {
                 ),
                 "MemberAlreadyInRole",
             );
+            */
 
             // registering another member in same role and actorid combination should fail
             assert_dispatch_error_message(