feat: add generic propose function

BREAKING CHANGE: removal of old propose functions
0xmetropolis · Jun 17, 2022 · affa94b · affa94b
1 parent d058fc9
commit affa94b
Show file tree

Hide file tree

Showing 8 changed files with 150 additions and 15 deletions.
diff --git a/docs/classes/Pod.html b/docs/classes/Pod.html
diff --git a/docs/classes/Proposal.html b/docs/classes/Proposal.html
diff --git a/docs/modules.html b/docs/modules.html
diff --git a/scripts/approve-proposal.ts b/scripts/approve-proposal.ts
@@ -24,7 +24,7 @@ async function main() {
     data = pod.populateMint(dummyAccount);
   }
 
-  const proposal = await pod.propose(data, walletOne.address)
+  const proposal = await pod.propose(data, walletOne.address);
 
   // const [proposal] = await pod.getProposals();
 

diff --git a/scripts/approve-superproposal.ts b/scripts/approve-superproposal.ts
@@ -51,7 +51,7 @@ async function main() {
 
   console.log('Executing both sub proposals');
   const subProposal = (await subPod.getProposals())[0];
-  await subProposal.approve(walletOne)
+  await subProposal.approve(walletOne);
   await subProposal.executeApprove(walletOne);
 
   const subProposalTwo = (await subPodTwo.getProposals())[0];

diff --git a/scripts/reject-proposal.ts b/scripts/reject-proposal.ts
@@ -22,7 +22,7 @@ async function main() {
     data = pod.populateMint(dummyAccount);
   }
 
-  const proposal = await pod.propose(data, walletOne.address)
+  const proposal = await pod.propose(data, walletOne.address);
 
   await proposal.reject(walletOne);
   await proposal.reject(walletTwo);

diff --git a/test/propose.test.ts b/test/propose.test.ts
@@ -32,7 +32,8 @@ function mockGetPodFetchersByAddress(opts?: { overrideAdmin?: string }) {
       getThreshold: jest
         .fn()
         .mockResolvedValueOnce({ toNumber: jest.fn().mockImplementation(() => 10) }),
-    },    podId: orcanautPod.id,
+    },
+    podId: orcanautPod.id,
     Name: { name: orcanautPod.ensName },
   });
 }
@@ -100,12 +101,14 @@ beforeEach(() => {
 test('Subpod members should be able to propose a mint member', async () => {
   mockGetPodFetchersByAddress();
   // Arbitrary return value.
-  const create = jest.spyOn(createSafe, 'createSafeTransaction').mockResolvedValue(erc20TransferTransaction);
+  const create = jest
+    .spyOn(createSafe, 'createSafeTransaction')
+    .mockResolvedValue(erc20TransferTransaction);
   const pod = await sdk.getPod(orcanautAddress);
 
   const mint = pod.populateMint(userAddress);
   await pod.propose(mint, artNautPod.members[0]);
-  
+
   expect(create).toHaveBeenCalledWith({
     sender: orcanautPod.members[0],
     to: mint.to,
@@ -116,19 +119,15 @@ test('Subpod members should be able to propose a mint member', async () => {
 
 test('Sub pod members should be able to propose a super pod mint', async () => {
   setupAdminAndSubPod();
-  const create = jest.spyOn(createSafe, 'createSafeTransaction').mockResolvedValue(erc20TransferTransaction);
+  const create = jest
+    .spyOn(createSafe, 'createSafeTransaction')
+    .mockResolvedValue(erc20TransferTransaction);
 
   const superPod = await sdk.getPod(orcanautAddress);
   const subPod = await sdk.getPod(artNautPod.safe);
   const mint = superPod.populateMint(userAddress);
 
-  await subPod.propose(
-    await superPod.propose(
-      mint,
-      orcanautPod.members[0]
-    ),
-    artNautPod.members[0]
-  );
+  await subPod.propose(await superPod.propose(mint, orcanautPod.members[0]), artNautPod.members[0]);
   expect(create).toHaveBeenNthCalledWith(1, {
     sender: orcanautPod.members[0],
     to: mint.to,

diff --git a/test/token.test.ts b/test/token.test.ts
@@ -160,5 +160,4 @@ describe('member actions', () => {
       'is already a member of this pod',
     );
   });
-
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -160,5 +160,4 @@ describe('member actions', () => { @@
           'is already a member of this pod',
         );
       });
     });