Remove explicit extra return values

bosonprotocol · Apr 20, 2023 · ae3226f · ae3226f
1 parent 6e03be1
commit ae3226f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 17 deletions.
diff --git a/test/protocol/ExchangeHandlerTest.js b/test/protocol/ExchangeHandlerTest.js
@@ -146,7 +146,7 @@ describe("IBosonExchangeHandler", function () {
       protocolConfig: [, , { percentage: protocolFeePercentage }],
       extraReturnValues: { bosonVoucher, voucherImplementation, accessController },
       diamondAddress: protocolDiamondAddress,
-    } = await setupTestEnvironment(contracts, { returnClient: true, returnAccessController: true }));
+    } = await setupTestEnvironment(contracts));
 
     [deployer] = await ethers.getSigners();
 

diff --git a/test/protocol/FundsHandlerTest.js b/test/protocol/FundsHandlerTest.js
@@ -130,7 +130,7 @@ describe("IBosonFundsHandler", function () {
       protocolConfig: [, , { percentage: protocolFeePercentage, buyerEscalationDepositPercentage }],
       diamondAddress: protocolDiamondAddress,
       extraReturnValues: { accessController },
-    } = await setupTestEnvironment(contracts, { returnAccessController: true }));
+    } = await setupTestEnvironment(contracts));
 
     // make all account the same
     assistant = clerk = admin;

diff --git a/test/protocol/MetaTransactionsHandlerTest.js b/test/protocol/MetaTransactionsHandlerTest.js
@@ -147,7 +147,7 @@ describe("IBosonMetaTransactionsHandler", function () {
       },
       extraReturnValues: { accessController },
       diamondAddress: protocolDiamondAddress,
-    } = await setupTestEnvironment(contracts, { returnAccessController: true }));
+    } = await setupTestEnvironment(contracts));
 
     // make all account the same
     assistant = clerk = admin;

diff --git a/test/protocol/clients/BosonVoucherTest.js b/test/protocol/clients/BosonVoucherTest.js
@@ -90,8 +90,6 @@ describe("IBosonVoucher", function () {
       extraReturnValues: { bosonVoucher, beacon, accessController },
     } = await setupTestEnvironment(contracts, {
       forwarderAddress: [forwarder.address],
-      returnClient: true,
-      returnAccessController: true,
     }));
 
     // make all account the same

diff --git a/test/protocol/clients/ClientExternalAddressesTest.js b/test/protocol/clients/ClientExternalAddressesTest.js
@@ -23,7 +23,7 @@ describe("IClientExternalAddresses", function () {
       signers: [rando, other1, other3],
       diamondAddress: protocolDiamondAddress,
       extraReturnValues: { beacon },
-    } = await setupTestEnvironment(contracts, { returnClient: true }));
+    } = await setupTestEnvironment(contracts));
 
     [deployer] = await ethers.getSigners();
 

diff --git a/test/util/utils.js b/test/util/utils.js
@@ -289,10 +289,7 @@ function objectToArray(input) {
   return result;
 }
 
-async function setupTestEnvironment(
-  contracts,
-  { returnClient = false, returnAccessController = false, bosonTokenAddress, forwarderAddress } = {}
-) {
+async function setupTestEnvironment(contracts, { bosonTokenAddress, forwarderAddress } = {}) {
   const facetNames = [
     "SellerHandlerFacet",
     "BuyerHandlerFacet",
@@ -321,7 +318,7 @@ async function setupTestEnvironment(
 
   // Deploy the Protocol Diamond
   const [protocolDiamond, , , , accessController] = await deployProtocolDiamond(maxPriorityFeePerGas);
-  if (returnAccessController) extraReturnValues = { ...extraReturnValues, accessController };
+  extraReturnValues["accessController"] = accessController;
 
   // Temporarily grant UPGRADER role to deployer account
   await accessController.grantRole(Role.UPGRADER, deployer.address);
@@ -341,12 +338,9 @@ async function setupTestEnvironment(
   );
   const [beacon] = beacons;
   const [proxy] = proxies;
-
-  if (returnClient) {
-    const [bosonVoucher] = clients;
-    const [voucherImplementation] = implementations;
-    extraReturnValues = { ...extraReturnValues, bosonVoucher, voucherImplementation, beacon };
-  }
+  const [bosonVoucher] = clients;
+  const [voucherImplementation] = implementations;
+  extraReturnValues = { ...extraReturnValues, bosonVoucher, voucherImplementation, beacon };
 
   // set protocolFees
   const protocolFeePercentage = "200"; // 2 %