refactor: remove proposal Id from queued after execute and cancel

VenusProtocol · Apr 9, 2024 · 8a98dfb · 8a98dfb
1 parent aca6eee
commit 8a98dfb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/contracts/Cross-chain/OmnichainGovernanceExecutor.sol b/contracts/Cross-chain/OmnichainGovernanceExecutor.sol
@@ -202,6 +202,7 @@ contract OmnichainGovernanceExecutor is ReentrancyGuard, BaseOmnichainController
                 ++i;
             }
         }
+        delete queued[proposalId_];
     }
 
     /**
@@ -237,6 +238,7 @@ contract OmnichainGovernanceExecutor is ReentrancyGuard, BaseOmnichainController
                 ++i;
             }
         }
+        delete queued[proposalId_];
     }
 
     /**

diff --git a/tests/Cross-chain/Omnichain.ts b/tests/Cross-chain/Omnichain.ts
@@ -426,6 +426,7 @@ describe("Omnichain: ", async function () {
     const proposalId = await getLastRemoteProposalId();
     await expect(executor.execute(proposalId)).to.emit(executor, "ProposalExecuted").withArgs(proposalId);
     expect(await executor.state(proposalId)).equals(2);
+    expect(await executor.queued(proposalId)).equals(false);
   });
 
   it("Should update delay of timelock on destination", async function () {
@@ -440,6 +441,7 @@ describe("Omnichain: ", async function () {
     mine(4500);
     const proposalId = await getLastRemoteProposalId();
     await executor.execute(proposalId);
+    expect(await executor.queued(proposalId)).equals(false);
     expect(await NormalTimelock.delay()).to.equals(newDelay);
   });
 
@@ -515,6 +517,7 @@ describe("Omnichain: ", async function () {
       .to.emit(executor, "ProposalCanceled")
       .withArgs(proposalId);
     expect(await executor.state(proposalId)).equals(0);
+    expect(await executor.queued(proposalId)).equals(false);
   });
 
   it("Reverts when cancel is called after execute", async function () {
-Original file line number
+Diff line change
@@ Expand Up @@
                     ++i;
                 }
             }
+            delete queued[proposalId_];
         }
         /**
@@ Expand Down Expand Up @@
                     ++i;
                 }
             }
+            delete queued[proposalId_];
         }
         /**
@@ Expand Down @@