Merge pull request #114 from santteegt/fix/custom-fixture-tags

enable additional fixture tags on baalSetup
HausDAO · Aug 23, 2023 · 76597b1 · 76597b1
2 parents 069286c + a2619dc
commit 76597b1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -118,6 +118,7 @@ You can `yarn add @daohaus/baal-contracts` on your own project and get access to
 
   ```js
     type BaalSetupOpts = {
+      fixtureTags?: Array<string>; // additional deployment tags
       daoSettings?: Partial<DAOSettings>;
       summonSetupOpts?: Partial<SummonSetup>;
       safeAddress?: `0x${string}`;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@daohaus/baal-contracts",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "Lo, also it is the time of His rain.",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

diff --git a/test/utils/baal.ts b/test/utils/baal.ts
@@ -1,10 +1,10 @@
-import { ethers } from 'hardhat';
+import { expect } from 'chai';
 import { BigNumber, BigNumberish, Contract, ContractTransaction } from 'ethers';
+import { ethers } from 'hardhat';
 
 import { Baal, BaalSummoner, MultiSend, Poster } from '../../src/types';
 import { encodeMultiAction } from '../../src/util';
 import { moveForwardPeriods } from './evm';
-import { expect } from 'chai';
 
 export type DAOSettings = {
     PROPOSAL_OFFERING: any;
@@ -306,22 +306,18 @@ export const submitAndProcessProposal = async ({
     encodedAction,
     proposal,
     proposalId,
-}: {
-    baal: Baal,
-    encodedAction: string,
-    proposal: ProposalType,
-    proposalId: BigNumberish
-}) => {
-    await baal.submitProposal(
-      encodedAction,
-      proposal.expiration,
-      proposal.baalGas,
-      ethers.utils.id(proposal.details)
-    );
-    await baal.submitVote(proposalId, true);
+  }: {
+    baal: Baal;
+    encodedAction: string;
+    proposal: ProposalType;
+    proposalId?: BigNumberish;
+  }) => {
+    await baal.submitProposal(encodedAction, proposal.expiration, proposal.baalGas, ethers.utils.id(proposal.details));
+    const id = proposalId ? proposalId : await baal.proposalCount();
+    await baal.submitVote(id, true);
     await moveForwardPeriods(defaultDAOSettings.VOTING_PERIOD_IN_SECONDS, 2);
-    return await baal.processProposal(proposalId, encodedAction);
-};
+    return await baal.processProposal(id, encodedAction);
+  };
 
 export const setShamanProposal = async (
     baal: Baal,

diff --git a/test/utils/fixtures.ts b/test/utils/fixtures.ts
@@ -58,6 +58,7 @@ export type UsersSetup = {
 }
 
 type BaalSetupOpts = {
+    fixtureTags?: Array<string>;
     daoSettings?: Partial<DAOSettings>;
     summonSetupOpts?: Partial<SummonSetup>;
     safeAddress?: `0x${string}`;
@@ -68,7 +69,7 @@ type BaalSetupOpts = {
     setupUsersOverride?: (params: SetupUsersParams) => Promise<UsersSetup>;
 }
 
-const setupUsersDefault = async ({
+export const setupUsersDefault = async ({
     // addresses,
     baal,
     hre,
@@ -190,7 +191,7 @@ export const baalSetup = deployments.createFixture<BaalSetupType, BaalSetupOpts>
     const { deployer } = await getNamedAccounts();
     const [summoner, applicant, shaman, s1, s2, s3, s4, s5, s6] = await getUnnamedAccounts();
 
-    await deployments.fixture(['Infra', 'TributeMinion', 'BaalSummoner']); // Deployment Tags
+    await deployments.fixture(['Infra', 'TributeMinion', 'BaalSummoner', ...(options?.fixtureTags || [])]); // Deployment Tags
 
     console.log('baalSetup fixture', options);
     // console.log('deployments', Object.keys(await deployments.all()));