From c44ca29d882edfec8d821f87c3068ed181910228 Mon Sep 17 00:00:00 2001
From: Miljan Milidrag <miljan.milidrag@protonmail.com>
Date: Wed, 21 Dec 2022 08:51:47 +0100
Subject: [PATCH] Fix: UnAssigned naming

---
 contracts/mocks/MasterMock.sol           | 2 +-
 lib/constants.js                         | 2 +-
 test/unit/MemberRoles/stateManagement.js | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contracts/mocks/MasterMock.sol b/contracts/mocks/MasterMock.sol
index e70d41c68f..f86cc5dc85 100644
--- a/contracts/mocks/MasterMock.sol
+++ b/contracts/mocks/MasterMock.sol
@@ -9,7 +9,7 @@ import "../modules/capital/Pool.sol";
 contract MasterMock {
 
   enum Role {
-    NonMember,
+    UnAssigned,
     AdvisoryBord,
     Member,
     Owner
diff --git a/lib/constants.js b/lib/constants.js
index 1c54b7e5b7..8f33464d10 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -32,7 +32,7 @@ const NXMasterOwnerParamType = {
 };
 
 const Role = {
-  NonMember: 0,
+  UnAssigned: 0,
   AdvisoryBoard: 1,
   Member: 2,
   Owner: 3,
diff --git a/test/unit/MemberRoles/stateManagement.js b/test/unit/MemberRoles/stateManagement.js
index 5adbb3d0f4..a356576349 100644
--- a/test/unit/MemberRoles/stateManagement.js
+++ b/test/unit/MemberRoles/stateManagement.js
@@ -84,9 +84,9 @@ describe('state management', function () {
       advisoryBoardMembers: [advisoryBoardMember],
     } = this.accounts;
 
-    // checkRole automatically returns true when the target role is NonMember/UnAssigned
+    // checkRole automatically returns true when the target role is UnAssigned
     const isMemberMember = await memberRoles.checkRole(member.address, Role.Member);
-    const isMemberNonMember = await memberRoles.checkRole(member.address, Role.NonMember);
+    const isMemberNonMember = await memberRoles.checkRole(member.address, Role.UnAssigned);
     const isMemberABMember = await memberRoles.checkRole(member.address, Role.AdvisoryBoard);
 
     expect(isMemberMember).to.be.equal(true);
@@ -94,7 +94,7 @@ describe('state management', function () {
     expect(isMemberABMember).to.be.equal(false);
 
     const isNonMemberMember = await memberRoles.checkRole(nonMember.address, Role.Member);
-    const isNonMemberNonMember = await memberRoles.checkRole(nonMember.address, Role.NonMember);
+    const isNonMemberNonMember = await memberRoles.checkRole(nonMember.address, Role.UnAssigned);
     const isNonMemberABMember = await memberRoles.checkRole(nonMember.address, Role.AdvisoryBoard);
 
     expect(isNonMemberMember).to.be.equal(false);
@@ -102,7 +102,7 @@ describe('state management', function () {
     expect(isNonMemberABMember).to.be.equal(false);
 
     const isABMemberMember = await memberRoles.checkRole(advisoryBoardMember.address, Role.Member);
-    const isABMemberNonMember = await memberRoles.checkRole(advisoryBoardMember.address, Role.NonMember);
+    const isABMemberNonMember = await memberRoles.checkRole(advisoryBoardMember.address, Role.UnAssigned);
     const isABMemberABMember = await memberRoles.checkRole(advisoryBoardMember.address, Role.AdvisoryBoard);
 
     expect(isABMemberMember).to.be.equal(true);