From b46fa6b36c42833d52fa2e83aaae6762175ffe62 Mon Sep 17 00:00:00 2001
From: Miljan Milidrag <miljan.milidrag@protonmail.com>
Date: Wed, 4 Jan 2023 09:35:14 +0100
Subject: [PATCH] Review changes: - zero address from ethers - typo fixes -
 removing unnecessary before

---
 contracts/mocks/MasterMock.sol                |  4 +--
 .../changeDependentContractAddress.js         | 28 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/contracts/mocks/MasterMock.sol b/contracts/mocks/MasterMock.sol
index f86cc5dc85..d5518a67bb 100644
--- a/contracts/mocks/MasterMock.sol
+++ b/contracts/mocks/MasterMock.sol
@@ -9,8 +9,8 @@ import "../modules/capital/Pool.sol";
 contract MasterMock {
 
   enum Role {
-    UnAssigned,
-    AdvisoryBord,
+    Unassigned,
+    AdvisoryBoard,
     Member,
     Owner
   }
diff --git a/test/unit/MemberRoles/changeDependentContractAddress.js b/test/unit/MemberRoles/changeDependentContractAddress.js
index 0b11621742..20a7174aae 100644
--- a/test/unit/MemberRoles/changeDependentContractAddress.js
+++ b/test/unit/MemberRoles/changeDependentContractAddress.js
@@ -1,18 +1,16 @@
 const { InternalContractsIDs } = require('../utils').constants;
 const { expect } = require('chai');
 const { hex } = require('../../../lib/helpers');
-const { ZERO_ADDRESS } = require('../../../lib/constants');
+const {
+  constants: { AddressZero },
+} = require('ethers');
 
 describe('changeDependentContractAddress', function () {
-  before(async function () {
-    const { quotationData, memberRoles } = this.contracts;
+  it('should change authorized address for the role', async function () {
+    const { quotationData, memberRoles, master } = this.contracts;
     const { governanceContracts, defaultSender } = this.accounts;
     await quotationData.connect(governanceContracts[0]).setKycAuthAddress(defaultSender.address);
     await memberRoles.connect(governanceContracts[0]).setKycAuthAddress(quotationData.address);
-  });
-
-  it('should change authorized address for the role', async function () {
-    const { memberRoles, master } = this.contracts;
 
     const tkAddressBefore = await memberRoles.internalContracts(InternalContractsIDs.TK);
     const tcAddressBefore = await memberRoles.internalContracts(InternalContractsIDs.TC);
@@ -20,10 +18,10 @@ describe('changeDependentContractAddress', function () {
     const coAddressBefore = await memberRoles.internalContracts(InternalContractsIDs.CO);
 
     await Promise.all([
-      master.setLatestAddress(hex('CO'), ZERO_ADDRESS),
-      master.setTokenAddress(ZERO_ADDRESS),
-      master.setLatestAddress(hex('TC'), ZERO_ADDRESS),
-      master.setLatestAddress(hex('P1'), ZERO_ADDRESS),
+      master.setLatestAddress(hex('CO'), AddressZero),
+      master.setTokenAddress(AddressZero),
+      master.setLatestAddress(hex('TC'), AddressZero),
+      master.setLatestAddress(hex('P1'), AddressZero),
     ]);
 
     await memberRoles.changeDependentContractAddress();
@@ -37,9 +35,9 @@ describe('changeDependentContractAddress', function () {
     expect(tcAddressAfter).not.to.be.equal(p1AddressBefore);
     expect(coAddressAfter).not.to.be.equal(coAddressBefore);
 
-    expect(tkAddressAfter).to.be.equal(ZERO_ADDRESS);
-    expect(tcAddressAfter).to.be.equal(ZERO_ADDRESS);
-    expect(p1AddressAfter).to.be.equal(ZERO_ADDRESS);
-    expect(coAddressAfter).to.be.equal(ZERO_ADDRESS);
+    expect(tkAddressAfter).to.be.equal(AddressZero);
+    expect(tcAddressAfter).to.be.equal(AddressZero);
+    expect(p1AddressAfter).to.be.equal(AddressZero);
+    expect(coAddressAfter).to.be.equal(AddressZero);
   });
 });