WIP: Move tests to top-level

Author: konradkonrad

gnosh_orig/test/KeyBroadcastContract.t.sol renamed to test/KeyBroadcastContract.t.sol

@@ -2,10 +2,9 @@
 pragma solidity ^0.8.20;
 
 import "forge-std/Test.sol";
-import "../src/IKeyBroadcastContract.sol";
-import "../src/KeyBroadcastContract.sol";
-import "../src/KeyperSetManager.sol";
-import "../src/KeyperSet.sol";
+import "../src/common/KeyBroadcastContract.sol";
+import "../src/common/KeyperSetManager.sol";
+import "../src/common/KeyperSet.sol";
 
 contract KeyBroadcastTest is Test {
     KeyBroadcastContract public keyBroadcastContract;
@@ -14,24 +13,27 @@ contract KeyBroadcastTest is Test {
     KeyperSet public keyperSet1;
     address public broadcaster0;
     address public broadcaster1;
+    address public deployer;
 
     event EonKeyBroadcast(uint64 eon, bytes key);
 
     function setUp() public {
+        
         broadcaster0 = address(1);
         broadcaster1 = address(2);
+        deployer = address(3);
 
-        keyperSetManager = new KeyperSetManager();
+        keyperSetManager = new KeyperSetManager(deployer);
         keyBroadcastContract = new KeyBroadcastContract(
             address(keyperSetManager)
         );
         keyperSet0 = new KeyperSet();
-        keyperSet0.setKeyBroadcaster(broadcaster0);
+        keyperSet0.setPublisher(broadcaster0);
         keyperSet0.setFinalized();
         keyperSetManager.addKeyperSet(100, address(keyperSet0));
 
         keyperSet1 = new KeyperSet();
-        keyperSet1.setKeyBroadcaster(broadcaster1);
+        keyperSet1.setPublisher(broadcaster1);
         keyperSet1.setFinalized();
         keyperSetManager.addKeyperSet(200, address(keyperSet1));
     }

gnosh_orig/test/KeyperSet.t.sol renamed to test/KeyperSet.t.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import "forge-std/Test.sol";
-import "../src/KeyperSet.sol";
+import "../src/common/KeyperSet.sol";
 
 contract KeyperSetRevertAfterFinalizedTest is Test {
     KeyperSet public keyperSet;
@@ -23,9 +23,9 @@ contract KeyperSetRevertAfterFinalizedTest is Test {
         keyperSet.addMembers(members);
     }
 
-    function testSetKeyBroadcaster() public {
+    function testSetPublisher() public {
         vm.expectRevert(AlreadyFinalized.selector);
-        keyperSet.setKeyBroadcaster(address(5));
+        keyperSet.setPublisher(address(5));
     }
 }
 
@@ -89,7 +89,7 @@ contract KeyperSetTest is Test {
     function testSetKeybroadcasterOnlyOwner() public {
         vm.expectRevert("Ownable: caller is not the owner");
         vm.prank(address(1));
-        keyperSet.setKeyBroadcaster(address(5));
+        keyperSet.setPublisher(address(5));
     }
 
     function testThreshold() public {
@@ -105,7 +105,7 @@ contract KeyperSetTest is Test {
     }
 
     function testBroadcaster() public {
-        keyperSet.setKeyBroadcaster(address(5));
+        keyperSet.setPublisher(address(5));
         keyperSet.setFinalized();
 
         assertEq(keyperSet.isAllowedToBroadcastEonKey(address(1)), false);

gnosh_orig/test/KeyperSetManager.t.sol renamed to test/KeyperSetManager.t.sol

@@ -2,16 +2,21 @@
 pragma solidity ^0.8.20;
 
 import "forge-std/Test.sol";
-import "../src/KeyperSetManager.sol";
-import "../src/KeyperSet.sol";
+import "../src/common/KeyperSetManager.sol";
+import "../src/common/KeyperSet.sol";
 
 contract KeyperSetManagerTest is Test {
     KeyperSetManager public keyperSetManager;
     KeyperSet public members0;
     KeyperSet public members1;
-
+    address public owner;
+    
     function setUp() public {
-        keyperSetManager = new KeyperSetManager();
+        owner = vm.addr(42);
+        vm.prank(owner);
+        keyperSetManager = new KeyperSetManager(owner);
+        vm.prank(owner);
+        keyperSetManager.initialize(owner, owner);
         members0 = new KeyperSet();
         members0.setFinalized();
         members1 = new KeyperSet();
@@ -20,15 +25,23 @@ contract KeyperSetManagerTest is Test {
 
     function testGetNumKeyperSets() public {
         assertEq(keyperSetManager.getNumKeyperSets(), 0);
+        vm.prank(owner);
         keyperSetManager.addKeyperSet(0, address(members0));
         assertEq(keyperSetManager.getNumKeyperSets(), 1);
+        vm.prank(owner);
         keyperSetManager.addKeyperSet(1, address(members0));
         assertEq(keyperSetManager.getNumKeyperSets(), 2);
     }
 
     function testAddKeyperSetOnlyOwner() public {
         vm.prank(address(1));
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                IAccessControl.AccessControlUnauthorizedAccount.selector,
+                address(1),
+                keyperSetManager.DEFAULT_ADMIN_ROLE
+            )
+        );
         keyperSetManager.addKeyperSet(0, address(members0));
     }
 
@@ -50,36 +63,37 @@ contract KeyperSetManagerTest is Test {
     function testAddKeyperSetEmits() public {
         vm.expectEmit(address(keyperSetManager));
         emit KeyperSetAdded(1000, address(members0));
+        vm.prank(owner);
         keyperSetManager.addKeyperSet(1000, address(members0));
     }
 
-    function testGetKeyperSetIndexBySlotEmpty() public {
+    function testGetKeyperSetIndexByBlockEmpty() public {
         vm.expectRevert(NoActiveKeyperSet.selector);
-        keyperSetManager.getKeyperSetIndexBySlot(0);
+        keyperSetManager.getKeyperSetIndexByBlock(0);
     }
 
-    function testGetKeyperSetIndexBySlot() public {
+    function testGetKeyperSetIndexByBlock() public {
         keyperSetManager.addKeyperSet(1000, address(members0));
         keyperSetManager.addKeyperSet(1100, address(members1));
 
         vm.expectRevert(NoActiveKeyperSet.selector);
-        keyperSetManager.getKeyperSetIndexBySlot(0);
+        keyperSetManager.getKeyperSetIndexByBlock(0);
 
         vm.expectRevert(NoActiveKeyperSet.selector);
-        keyperSetManager.getKeyperSetIndexBySlot(999);
+        keyperSetManager.getKeyperSetIndexByBlock(999);
 
-        assertEq(keyperSetManager.getKeyperSetIndexBySlot(1000), 0);
-        assertEq(keyperSetManager.getKeyperSetIndexBySlot(1099), 0);
+        assertEq(keyperSetManager.getKeyperSetIndexByBlock(1000), 0);
+        assertEq(keyperSetManager.getKeyperSetIndexByBlock(1099), 0);
 
-        assertEq(keyperSetManager.getKeyperSetIndexBySlot(1100), 1);
-        assertEq(keyperSetManager.getKeyperSetIndexBySlot(1250), 1);
+        assertEq(keyperSetManager.getKeyperSetIndexByBlock(1100), 1);
+        assertEq(keyperSetManager.getKeyperSetIndexByBlock(1250), 1);
     }
 
-    function testGetKeyperSetActivationSlot() public {
+    function testGetKeyperSetActivationBlock() public {
         keyperSetManager.addKeyperSet(1000, address(members0));
         keyperSetManager.addKeyperSet(1100, address(members1));
-        assertEq(keyperSetManager.getKeyperSetActivationSlot(0), 1000);
-        assertEq(keyperSetManager.getKeyperSetActivationSlot(1), 1100);
+        assertEq(keyperSetManager.getKeyperSetActivationBlock(0), 1000);
+        assertEq(keyperSetManager.getKeyperSetActivationBlock(1), 1100);
     }
 
     function testGetKeyperSetAddress() public {

gnosh_orig/test/Sequencer.t.sol renamed to test/Sequencer.t.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.8.20;
 
 import "forge-std/Test.sol";
-import "../src/ISequencer.sol";
-import "../src/Sequencer.sol";
+import "../src/common/intf/ISequencer.sol";
+import "../src/gnosh/Sequencer.sol";
 
 contract SequencerTest is Test {
     Sequencer public sequencer;

gnosh_orig/test/ValidatorRegistry.t.sol renamed to test/ValidatorRegistry.t.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.8.20;
 
 import "forge-std/Test.sol";
-import "../src/IValidatorRegistry.sol";
-import "../src/ValidatorRegistry.sol";
+import "../src/common/intf/IValidatorRegistry.sol";
+import "../src/gnosh/ValidatorRegistry.sol";
 
 contract ValidatorRegistryTest is Test {
     event Updated(bytes message, bytes signature);