remove duplicate event names - not supported by ethers.js

collectivexyz · Dec 6, 2022 · 92b9b1e · 92b9b1e
1 parent fa63379
commit 92b9b1e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/contracts/GovernanceStorage.sol b/contracts/GovernanceStorage.sol
@@ -697,7 +697,7 @@ contract GovernanceStorage is Storage, UpgradeableContract, ERC165, Ownable {
         if (isChoiceVote(_proposalId)) {
             Choice storage choice = proposal.choice[_choiceId];
             choice.voteCount += _shareCount;
-            emit VoteCast(_proposalId, _wallet, _shareId, _choiceId, _shareCount);
+            emit ChoiceVoteCast(_proposalId, _wallet, _shareId, _choiceId, _shareCount);
         } else {
             emit VoteCast(_proposalId, _wallet, _shareId, _shareCount);
         }

diff --git a/contracts/Storage.sol b/contracts/Storage.sol
@@ -120,7 +120,7 @@ interface Storage is Upgradeable, IERC165 {
     event Executed(uint256 proposalId);
 
     event VoteCast(uint256 proposalId, address voter, uint256 shareId, uint256 totalVotesCast);
-    event VoteCast(uint256 proposalId, address voter, uint256 shareId, uint256 choiceId, uint256 totalVotesCast);
+    event ChoiceVoteCast(uint256 proposalId, address voter, uint256 shareId, uint256 choiceId, uint256 totalVotesCast);
     event UndoVote(uint256 proposalId, address voter, uint256 shareId, uint256 votesUndone);
     event VoteVeto(uint256 proposalId, address supervisor);
     event VoteFinal(uint256 proposalId, uint256 startTime, uint256 endTime);

diff --git a/contracts/VoterClassCreator.sol b/contracts/VoterClassCreator.sol
@@ -50,7 +50,6 @@ import "../contracts/access/Upgradeable.sol";
 /// @title Interface for VoterClass creation
 /// @custom:type interface
 interface VoterClassCreator is Upgradeable, IERC165 {
-    event VoterClassCreated(address voterClass);
     event VoterClassCreated(address voterClass, address project);
 
     /// @notice create a VoterClass for open voting

diff --git a/contracts/VoterClassFactory.sol b/contracts/VoterClassFactory.sol
@@ -63,7 +63,7 @@ contract VoterClassFactory is VoterClassCreator, UpgradeableContract, ERC165 {
     function createOpenVote(uint256 _weight) external returns (address) {
         VoterClass _class = new VoterClassOpenVote(_weight);
         address _classAddr = address(_class);
-        emit VoterClassCreated(_classAddr);
+        emit VoterClassCreated(_classAddr, msg.sender);
         return _classAddr;
     }
 
@@ -73,7 +73,7 @@ contract VoterClassFactory is VoterClassCreator, UpgradeableContract, ERC165 {
     function createVoterPool(uint256 _weight) external returns (address) {
         VoterClass _class = new VoterClassVoterPool(_weight);
         address _classAddr = address(_class);
-        emit VoterClassCreated(_classAddr);
+        emit VoterClassCreated(_classAddr, msg.sender);
         return _classAddr;
     }