Start resolution #25 (#61)

First resolution is #25, to keep id progression from before hard fork.
NeokingdomDAO · Apr 28, 2023 · fc131be · fc131be
1 parent 446f3b1
commit fc131be
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/contracts/ResolutionManager/ResolutionManagerBase.sol b/contracts/ResolutionManager/ResolutionManagerBase.sol
@@ -99,7 +99,7 @@ abstract contract ResolutionManagerBase {
         _addResolutionType("routine", 51, 3 days, 2 days, true);
         _addResolutionType("genesis", 100, 0 days, 4 days, false);
 
-        _currentResolutionId = 1;
+        _currentResolutionId = 25;
     }
 
     modifier onlyPending(uint256 resolutionId) {

diff --git a/test/Integration.ts b/test/Integration.ts
@@ -155,7 +155,7 @@ describe("Integration", async () => {
   describe("integration", async () => {
     var currentResolution: number;
     beforeEach(async () => {
-      currentResolution = 0;
+      currentResolution = 24;
     });
 
     async function _mintTokens(user: SignerWithAddress, tokens: number) {

diff --git a/test/ResolutionManager.ts b/test/ResolutionManager.ts
@@ -31,7 +31,7 @@ const DAY = 60 * 60 * 24;
 describe("Resolution", async () => {
   let snapshotId: string;
 
-  let resolutionId = 1;
+  let resolutionId = 25;
   let resolutionSnapshotId = 42;
 
   let managingBoardStatus: string;
@@ -1440,10 +1440,10 @@ describe("Resolution", async () => {
       setupUser(user1, 51);
       await setupResolution(100);
 
-      await resolution.connect(user1).vote(1, true);
+      await resolution.connect(user1).vote(resolutionId, true);
       await mineEVMBlock();
 
-      const result = await resolution.getResolutionResult(1);
+      const result = await resolution.getResolutionResult(resolutionId);
       expect(result).true;
     });
 
@@ -1453,22 +1453,22 @@ describe("Resolution", async () => {
 
       await setupResolution(100);
 
-      await resolution.connect(user1).vote(1, true);
-      await resolution.connect(user2).vote(1, true);
+      await resolution.connect(user1).vote(resolutionId, true);
+      await resolution.connect(user2).vote(resolutionId, true);
       await mineEVMBlock();
 
-      const result = await resolution.getResolutionResult(1);
+      const result = await resolution.getResolutionResult(resolutionId);
       expect(result).true;
     });
 
     it("should return false when minimum quorum is not achieved - 1 user", async () => {
       setupUser(user1, 50);
       await setupResolution(100);
 
-      await resolution.connect(user1).vote(1, true);
+      await resolution.connect(user1).vote(resolutionId, true);
       await mineEVMBlock();
 
-      const result = await resolution.getResolutionResult(1);
+      const result = await resolution.getResolutionResult(resolutionId);
       expect(result).false;
     });
 
@@ -1478,11 +1478,11 @@ describe("Resolution", async () => {
 
       await setupResolution(100);
 
-      await resolution.connect(user1).vote(1, true);
-      await resolution.connect(user2).vote(1, false);
+      await resolution.connect(user1).vote(resolutionId, true);
+      await resolution.connect(user2).vote(resolutionId, false);
       await mineEVMBlock();
 
-      const result = await resolution.getResolutionResult(1);
+      const result = await resolution.getResolutionResult(resolutionId);
 
       expect(result).false;
     });
@@ -1491,17 +1491,17 @@ describe("Resolution", async () => {
       setupUser(user1, 51);
       await setupResolution(100, true);
 
-      const result = await resolution.getResolutionResult(1);
+      const result = await resolution.getResolutionResult(resolutionId);
       expect(result).true;
     });
 
     it("should return false when minimum quorum is not achieved - 1 user, negative resolution", async () => {
       setupUser(user1, 51);
       await setupResolution(100, true);
 
-      await resolution.connect(user1).vote(1, true);
+      await resolution.connect(user1).vote(resolutionId, true);
 
-      const result = await resolution.getResolutionResult(1);
+      const result = await resolution.getResolutionResult(resolutionId);
       expect(result).false;
     });
 
@@ -1510,9 +1510,9 @@ describe("Resolution", async () => {
       setupUser(user2, 1);
       await setupResolution(100, true);
 
-      await resolution.connect(user1).vote(1, true);
+      await resolution.connect(user1).vote(resolutionId, true);
 
-      const result = await resolution.getResolutionResult(1);
+      const result = await resolution.getResolutionResult(resolutionId);
       expect(result).true;
     });
 
@@ -1521,10 +1521,10 @@ describe("Resolution", async () => {
       setupUser(user2, 1);
       await setupResolution(100, true);
 
-      await resolution.connect(user1).vote(1, true);
-      await resolution.connect(user2).vote(1, true);
+      await resolution.connect(user1).vote(resolutionId, true);
+      await resolution.connect(user2).vote(resolutionId, true);
 
-      const result = await resolution.getResolutionResult(1);
+      const result = await resolution.getResolutionResult(resolutionId);
       expect(result).false;
     });
   });
@@ -1557,7 +1557,7 @@ describe("Resolution", async () => {
           [dataSimpleFunction(0), dataSimpleFunction(1)]
         );
 
-      const result = await resolution.getExecutionDetails(1);
+      const result = await resolution.getExecutionDetails(resolutionId);
 
       expect(result[0][0]).equal(resolutionExecutorMock.address);
       expect(result[0][1]).equal(user2.address);
@@ -1575,7 +1575,7 @@ describe("Resolution", async () => {
       await setEVMTimestamp(votingTimestamp);
       await mineEVMBlock();
 
-      await resolution.executeResolution(1);
+      await resolution.executeResolution(resolutionId);
     });
 
     it("should pass the given single parameter to the executor", async () => {
@@ -1588,7 +1588,7 @@ describe("Resolution", async () => {
       await setEVMTimestamp(votingTimestamp + DAY * 2);
       await mineEVMBlock();
 
-      await expect(resolution.executeResolution(1))
+      await expect(resolution.executeResolution(resolutionId))
         .to.emit(resolutionExecutorMock, "MockExecutionSimple")
         .withArgs(42);
     });
@@ -1603,7 +1603,7 @@ describe("Resolution", async () => {
       await setEVMTimestamp(votingTimestamp);
       await mineEVMBlock();
 
-      await expect(resolution.executeResolution(1))
+      await expect(resolution.executeResolution(resolutionId))
         .to.emit(resolutionExecutorMock, "MockExecutionArray")
         .withArgs([42, 43]);
     });
@@ -1617,12 +1617,12 @@ describe("Resolution", async () => {
       await setEVMTimestamp(votingTimestamp);
       await mineEVMBlock();
 
-      await resolution.connect(user1).vote(1, true);
+      await resolution.connect(user1).vote(resolutionId, true);
 
       await setEVMTimestamp(votingTimestamp + DAY * 2);
       await mineEVMBlock();
 
-      await expect(resolution.executeResolution(1)).revertedWith(
+      await expect(resolution.executeResolution(resolutionId)).revertedWith(
         "Resolution: nothing to execute"
       );
     });
@@ -1643,12 +1643,12 @@ describe("Resolution", async () => {
       await setEVMTimestamp(votingTimestamp);
       await mineEVMBlock();
 
-      await resolution.connect(user1).vote(1, true);
+      await resolution.connect(user1).vote(resolutionId, true);
 
       await setEVMTimestamp(votingTimestamp + DAY * 2);
       await mineEVMBlock();
 
-      await expect(resolution.executeResolution(1))
+      await expect(resolution.executeResolution(resolutionId))
         .to.emit(resolutionExecutorMock, "MockExecutionSimple")
         .withArgs(42)
         .to.emit(resolutionExecutorMock, "MockExecutionSimple")
@@ -1668,7 +1668,7 @@ describe("Resolution", async () => {
       await setEVMTimestamp(votingTimestamp);
       await mineEVMBlock();
 
-      await expect(resolution.executeResolution(1)).revertedWith(
+      await expect(resolution.executeResolution(resolutionId)).revertedWith(
         "Resolution: not ended"
       );
     });
@@ -1684,7 +1684,7 @@ describe("Resolution", async () => {
           [dataSimpleFunction(0)]
         );
 
-      await expect(resolution.executeResolution(1)).revertedWith(
+      await expect(resolution.executeResolution(resolutionId)).revertedWith(
         "Resolution: not approved"
       );
     });
@@ -1703,7 +1703,7 @@ describe("Resolution", async () => {
       await setEVMTimestamp(votingTimestamp);
       await mineEVMBlock();
 
-      await expect(resolution.executeResolution(1)).revertedWith(
+      await expect(resolution.executeResolution(resolutionId)).revertedWith(
         "Resolution: not passed"
       );
     });
@@ -1718,9 +1718,9 @@ describe("Resolution", async () => {
       await setEVMTimestamp(votingTimestamp);
       await mineEVMBlock();
 
-      await resolution.executeResolution(1);
+      await resolution.executeResolution(resolutionId);
 
-      await expect(resolution.executeResolution(1)).revertedWith(
+      await expect(resolution.executeResolution(resolutionId)).revertedWith(
         "Resolution: already executed"
       );
     });
@@ -1737,7 +1737,7 @@ describe("Resolution", async () => {
       await setEVMTimestamp(votingTimestamp);
       await mineEVMBlock();
 
-      await expect(resolution.executeResolution(1)).revertedWith(
+      await expect(resolution.executeResolution(resolutionId)).revertedWith(
         "Resolution: execution failed"
       );
     });

diff --git a/test/Upgrade.ts b/test/Upgrade.ts
@@ -76,7 +76,7 @@ describe("Upgrade", () => {
   describe("upgrades", async () => {
     var currentResolution: number;
     beforeEach(async () => {
-      currentResolution = 0;
+      currentResolution = 24;
     });
 
     async function _mintTokens(user: SignerWithAddress, tokens: number) {