address comments

aragon · May 15, 2023 · d5cdc47 · d5cdc47
1 parent 68e73a3
commit d5cdc47
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/packages/contracts/src/test/osx-versions/Migration.sol b/packages/contracts/src/test/osx-versions/Migration.sol
@@ -2,5 +2,23 @@
 
 pragma solidity 0.8.17;
 
+/*
+ * Migrations.sol
+ *
+ * This is a helper contract to manage and run the migrations of the Aragon OSX Protocol contracts.
+ * It serves as a centralized point of control for importing different versions of contracts, which
+ * is particularly useful for testing and development purposes.
+ *
+ * In this file, we import different versions of a contract. This allows us to test how our system
+ * behaves with each of these versions, and ensure backward compatibility with older versions.
+ *
+ * The contracts from the specified versions are imported and aliased as <contract-name>_<versions_name>,
+ * making them easy to reference in our tests and migration scripts.
+ *
+ * After importing a contract here, the contract will be compiled and TypeChain typings will be generated,
+ * enabling type-safe interactions with the contract in our tests.
+ *
+ */
+
 import {DAO as DAO_v1_0_0} from "@aragon/osx-versions/versions/v1_0_0/contracts/core/dao/DAO.sol";
 import {DAO as DAO_v1_2_0} from "@aragon/osx-versions/versions/v1_2_0/contracts/core/dao/DAO.sol";
diff --git a/packages/contracts/test/plugins/governance/multisig/multisig.ts b/packages/contracts/test/plugins/governance/multisig/multisig.ts
@@ -775,13 +775,13 @@ describe('Multisig', function () {
       });
     });
 
-    it('should revert if startDate is < than now', async () => {
+    it.only('should revert if startDate is < than now', async () => {
       // set next block time & mine a block with this time.
-      const nextBlockTime = (await getTime()) + 500;
-      await ethers.provider.send('evm_mine', [nextBlockTime]);
+      const block1Timestamp = (await getTime()) + 12;
+      await ethers.provider.send('evm_mine', [block1Timestamp]);
       // set next block's timestamp
-      const nextTimeStamp = nextBlockTime + 500;
-      await setTimeForNextBlock(nextTimeStamp);
+      const block2Timestamp = block1Timestamp + 12;
+      await setTimeForNextBlock(block2Timestamp);
 
       await expect(
         multisig.createProposal(
@@ -795,7 +795,7 @@ describe('Multisig', function () {
         )
       )
         .to.be.revertedWithCustomError(multisig, 'DateOutOfBounds')
-        .withArgs(nextTimeStamp, 5);
+        .withArgs(block2Timestamp, 5);
     });
 
     it('should revert if endDate is < than startDate', async () => {

diff --git a/packages/contracts/test/plugins/utils/ratio.ts b/packages/contracts/test/plugins/utils/ratio.ts
@@ -8,7 +8,8 @@ describe('Ratio', function () {
   let ratio: RatioTest;
 
   before(async () => {
-    const RatioTest = new RatioTest__factory((await ethers.getSigners())[0]);
+    const signers = await ethers.getSigners();
+    const RatioTest = new RatioTest__factory(signers[0]);
     ratio = await RatioTest.deploy();
   });
 

diff --git a/packages/contracts/test/test-utils/conditions.ts b/packages/contracts/test/test-utils/conditions.ts
@@ -4,9 +4,8 @@ import {PermissionConditionMock} from '../../../typechain';
 import {PermissionConditionMock__factory} from '../../typechain';
 
 export async function DeployTestPermissionCondition(): Promise<PermissionConditionMock> {
-  const aclConditionFactory = new PermissionConditionMock__factory(
-    (await ethers.getSigners())[0]
-  );
+  const signers = await ethers.getSigners();
+  const aclConditionFactory = new PermissionConditionMock__factory(signers[0]);
   const permissionCondition = await aclConditionFactory.deploy();
   return permissionCondition;
 }