Revert AlreadyHaveKey

src/EonKeyPublish.sol

@@ -48,10 +48,11 @@ contract EonKeyPublish is EonKeyPublisher {
             revert AlreadyVoted();
         }
         if (eonKeyConfirmed(eonKey)) {
-            // broadcast
-            broadcaster.broadcastEonKey(eon, eonKey);
-            //exit
-            return;
+            try broadcaster.broadcastEonKey(eon, eonKey) {
+                return;
+            } catch Error(string memory) {
+                return;
+            }
         }
     }
 }

src/KeyBroadcastContract.sol

@@ -6,6 +6,7 @@ import "src/KeyperSet.sol";
 
 error InvalidKey();
 error NotAllowed();
+error AlreadyHaveKey();
 
 interface EonKeyPublisher {
     function eonKeyConfirmed(bytes memory eonKey) external returns (bool);
@@ -16,7 +17,6 @@ contract KeyBroadcastContract {
     KeyperSetManager private keyperSetManager;
 
     event EonKeyBroadcast(uint64 eon, bytes key);
-    event AlreadyHaveKey(uint64 eon, bytes key);
 
     constructor(address keyperSetManagerAddress) {
         keyperSetManager = KeyperSetManager(keyperSetManagerAddress);
@@ -27,8 +27,7 @@ contract KeyBroadcastContract {
             revert InvalidKey();
         }
         if (keys[eon].length > 0) {
-            emit AlreadyHaveKey(eon, key);
-            return;
+            revert AlreadyHaveKey();
         }
         KeyperSet keyperSet = KeyperSet(
             keyperSetManager.getKeyperSetAddress(eon)

test/EonKeyPublish.t.sol

@@ -15,7 +15,6 @@ contract EonKeyPublishTest is Test {
 
     event EonVoteRegistered(uint64 eon, bytes key);
     event EonKeyBroadcast(uint64 eon, bytes key);
-    event AlreadyHaveKey(uint64 eon, bytes key);
 
     function setUp() public {
         initializer = address(19);
@@ -122,8 +121,7 @@ contract EonKeyPublishTest is Test {
                     emit EonKeyBroadcast(eon, key);
                     // after Broadcast we should see AlreadyHaveKey
                 } else {
-                    vm.expectEmit(address(broadcastContract));
-                    emit AlreadyHaveKey(eon, key);
+                    vm.expectRevert(AlreadyHaveKey.selector);
                 }
                 eonKeyPublish.publishEonKey(key, uint64(idx));
                 // members can't change their vote

test/KeyBroadcastContract.t.sol

@@ -7,7 +7,7 @@ import "../src/KeyperSetManager.sol";
 import "../src/KeyperSet.sol";
 
 contract MockPublisher is EonKeyPublisher {
-    function eonKeyConfirmed(bytes memory eonKey) external returns (bool) {
+    function eonKeyConfirmed(bytes memory) external returns (bool) {
         return true;
     }
 }
@@ -25,7 +25,6 @@ contract KeyBroadcastTest is Test {
     MockPublisher public publisher1;
 
     event EonKeyBroadcast(uint64 eon, bytes key);
-    event AlreadyHaveKey(uint64 eon, bytes key);
 
     function setUp() public {
         address initializer = address(69);
@@ -77,8 +76,7 @@ contract KeyBroadcastTest is Test {
         keyBroadcastContract.broadcastEonKey(1, key);
 
         vm.prank(address(publisher1));
-        vm.expectEmit(address(keyBroadcastContract));
-        emit AlreadyHaveKey(1, key);
+        vm.expectRevert(AlreadyHaveKey.selector);
         keyBroadcastContract.broadcastEonKey(1, key);
     }