tests

Author: 0xmovses

.gitmodules

@@ -7,6 +7,4 @@
 [submodule "protocol-units/dispute/lib/murky"]
 	path = protocol-units/dispute/lib/murky
 	url = https://github.com/dmfxyz/murky
-[submodule "protocol-units/dispute/lib/murkys"]
-	path = protocol-units/dispute/lib/murkys
-	url = https://github.com/dmfxyz/murky
+

protocol-units/dispute/foundry.toml

@@ -3,5 +3,6 @@ src = "src"
 out = "out"
 libs = ["lib"]
 ffi = true
+gas_limit = 10000000
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

protocol-units/dispute/src/RStarM.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.13;
 import {Output, OutputLib, Receipt, ReceiptClaim, ReceiptClaimLib, IRiscZeroVerifier, SystemExitCode, ExitCode} from "./IRiscZeroVerifier.sol";
 import {Groth16Verifier} from "./groth16/Groth16Verifier.sol";
 import {SafeCast} from "openzeppelin-contracts/contracts/utils/math/SafeCast.sol";
+import "forge-std/console2.sol";
 
 /// @notice A Groth16 seal over the claimed receipt claim.
 struct Seal {
@@ -100,14 +101,17 @@ contract RStarM is IRiscZeroVerifier, Groth16Verifier {
         //verifier = IRiscZeroVerifier(_verifier);
     }
 
-
     function registerValidator() external payable {
         require(msg.value >= MIN_STAKE, "Insufficient stake");
         require(!validators[msg.sender].isRegistered, "Validator already registered");
         validators[msg.sender] = Validator(true, msg.value);
         emit ValidatorRegistered(msg.sender, msg.value);
     }
 
+    function getValidator(address validator) external view returns (bool, uint256) {
+        return (validators[validator].isRegistered, validators[validator].stake);
+    }
+
     function deregisterValidator() external {
         Validator storage validator = validators[msg.sender];
         require(validator.isRegistered, "Validator not registered");

protocol-units/dispute/test/RStarM.t.sol

@@ -5,6 +5,7 @@ import {Test} from "forge-std/Test.sol";
 import {console2} from "forge-std/console2.sol";
 
 import "ds-test/test.sol";
+import "forge-std/console2.sol";
 import "../src/RStarM.sol";
 import "forge-std/Vm.sol";
 import {
@@ -43,28 +44,22 @@ contract RStartM is DSTest {
     );
 
     function setUp() public {
-        rStarM = new RStarM(1, 15, 1, ControlID.CONTROL_ID_0, ControlID.CONTROL_ID_1);
-        rStarM.registerValidator();
+        rStarM = new RStarM(1, 15, 2, ControlID.CONTROL_ID_0, ControlID.CONTROL_ID_1);
+        vm.deal(address(this), rStarM.MIN_STAKE());
     }
 
     function testRegisterValidator() public {
-      vm.deal(validator, rStarM.MIN_STAKE());
-      vm.prank(validator);
-      rStarM.registerValidator();
+      uint256 initialBalance = 100 ether;
+      vm.deal(signer1, initialBalance);
+      uint256 minStake = rStarM.MIN_STAKE();
 
-      (bool isRegistered, uint256 stake) = rStarM.validators(validator);
-      assertTrue(isRegistered, "Validator should be registered");
-      assertEq(stake, rStarM.MIN_STAKE(), "Validator stake should match the minimum stake");
-    }
-
-    // function testAddSigner() public {
-    //     assertTrue(rStarM.isSigner(signer1), "signer1 should be a signer after addition");
-    // }
+      vm.prank(signer1);
+      rStarM.registerValidator{value: minStake}();
 
-    // function testRemoveSigner() public {
-    //     rStarM.removeSigner(signer1);
-    //     assertTrue(!rStarM.isSigner(signer1), "signer1 should not be a signer after removal");
-    // }
+      (bool isRegistered, uint256 stake) = rStarM.getValidator(signer1);
+      assertTrue(isRegistered, "Validator should be registered");
+      assertEq(stake, minStake, "Validator stake should match the provided stake");
+    } 
 
     function testVerifyKnownGoodReceipt() external view {
         require(rStarM.verify_integrity(TEST_RECEIPT), "verification failed");