tests: adjust for latest changes

synapsecns · Aug 9, 2022 · 7290885 · 7290885
1 parent d19d9cf
commit 7290885
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/packages/contracts/test/Home.t.sol b/packages/contracts/test/Home.t.sol
@@ -30,7 +30,7 @@ contract HomeTest is SynapseTestWithUpdaterManager {
  assertEq(address(home.updaterManager()), address(updaterManager));
  assertEq(home.owner(), address(this));
  assertEq(uint256(home.state()), 1);
- assertEq(home.updater(), updater);
+ assertTrue(home.isNotary(updater));
  }
 
  function test_cannotInitializeTwice() public {
@@ -44,10 +44,10 @@ contract HomeTest is SynapseTestWithUpdaterManager {
  }
 
  function test_setUpdater() public {
- assertFalse(home.updater() == address(1337));
+ assertFalse(home.isNotary(address(1337)));
  vm.prank(address(updaterManager));
  home.setUpdater(address(1337));
- assertEq(home.updater(), address(1337));
+ assertTrue(home.isNotary(address(1337)));
  }
 
  function test_cannotSetUpdaterManagerAsNotOwner(address _notOwner) public {
@@ -71,7 +71,7 @@ contract HomeTest is SynapseTestWithUpdaterManager {
  }
 
  function test_haltsOnFail() public {
- home.setFailed();
+ home.setFailed(updater);
  vm.expectRevert("failed state");
  home.dispatch(
  remoteDomain,

diff --git a/packages/contracts/test/ReplicaManager.t.sol b/packages/contracts/test/ReplicaManager.t.sol
@@ -47,7 +47,7 @@ contract ReplicaManagerTest is SynapseTest {
  // ============ INITIAL STATE ============
  function test_correctlyInitialized() public {
  assertEq(uint256(replicaManager.localDomain()), uint256(localDomain));
- assertEq(replicaManager.updater(), updater);
+ assertTrue(replicaManager.isNotary(remoteDomain, updater));
  }
 
  function test_cannotInitializeTwice() public {
@@ -61,14 +61,14 @@ contract ReplicaManagerTest is SynapseTest {
  vm.assume(_notOwner != replicaManager.owner());
  vm.prank(_notOwner);
  vm.expectRevert("Ownable: caller is not the owner");
- replicaManager.setUpdater(_updater);
+ replicaManager.setUpdater(remoteDomain, _updater);
  }
 
  function test_setUpdater(address _updater) public {
- vm.assume(_updater != replicaManager.updater());
+ vm.assume(_updater != updater);
  vm.prank(replicaManager.owner());
- replicaManager.setUpdater(_updater);
- assertEq(replicaManager.updater(), _updater);
+ replicaManager.setUpdater(remoteDomain, _updater);
+ assertTrue(replicaManager.isNotary(remoteDomain, _updater));
  }
 
  function test_cannotSetConfirmationAsNotOwner(address _notOwner) public {
@@ -94,7 +94,7 @@ contract ReplicaManagerTest is SynapseTest {
  assertEq(replicaManager.activeReplicaConfirmedAt(remoteDomain, ROOT), _confirmAt);
  }
 
- event Update(
+ event AttestationAccepted(
  uint32 indexed homeDomain,
  uint32 indexed nonce,
  bytes32 indexed root,
@@ -104,7 +104,7 @@ contract ReplicaManagerTest is SynapseTest {
  // Relayer relays a new root signed by updater on Home chain
  function test_successfulUpdate() public {
  uint32 nonce = 42;
- assertEq(replicaManager.updater(), vm.addr(updaterPK));
+ assertTrue(replicaManager.isNotary(remoteDomain, vm.addr(updaterPK)));
  (bytes memory attestation, bytes memory sig) = signRemoteAttestation(
  updaterPK,
  nonce,
@@ -114,7 +114,7 @@ contract ReplicaManagerTest is SynapseTest {
  assertEq(replicaManager.activeReplicaConfirmedAt(remoteDomain, ROOT), 0);
  // Relayer sends over a root signed by the updater on the Home chain
  vm.expectEmit(true, true, true, true);
- emit Update(remoteDomain, nonce, ROOT, sig);
+ emit AttestationAccepted(remoteDomain, nonce, ROOT, sig);
  replicaManager.submitAttestation(attestation);
  // Time at which root was confirmed is set, optimistic timeout starts now
  assertEq(replicaManager.activeReplicaConfirmedAt(remoteDomain, ROOT), block.timestamp);

diff --git a/packages/contracts/test/UpdaterManager.t.sol b/packages/contracts/test/UpdaterManager.t.sol
@@ -52,12 +52,12 @@ contract UpdaterManagerTest is SynapseTestWithUpdaterManager {
  function test_setUpdaterAsOwner() public {
  vm.startPrank(updaterManager.owner());
  assertEq(updaterManager.updater(), address(updater));
- assertEq(home.updater(), address(updater));
+ assertTrue(home.isNotary(updater));
  vm.expectEmit(false, false, false, true);
  emit NewUpdater(fakeUpdater);
  updaterManager.setUpdater(address(fakeUpdater));
  assertEq(updaterManager.updater(), address(fakeUpdater));
- assertEq(home.updater(), address(fakeUpdater));
+ assertTrue(home.isNotary(fakeUpdater));
  }
 
  function test_cannotSlashUpdaterAsNotHome(address _notHome) public {

diff --git a/packages/contracts/test/harnesses/HomeHarness.sol b/packages/contracts/test/harnesses/HomeHarness.sol
@@ -9,12 +9,16 @@ contract HomeHarness is Home {
 
  constructor(uint32 _domain) Home(_domain) {}
 
+ function isNotary(address _notary) public view returns (bool) {
+ return _isNotary(localDomain, _notary);
+ }
+
  function setSensitiveValue(uint256 _newValue) external onlySystemMessenger {
  sensitiveValue = _newValue;
  }
 
- function setFailed() public {
- _fail();
+ function setFailed(address _notary) public {
+ _fail(_notary);
  }
 
  function destinationAndNonce(uint32 _destination, uint32 _nonce) public pure returns (uint64) {

diff --git a/packages/contracts/test/harnesses/ReplicaManagerHarness.sol b/packages/contracts/test/harnesses/ReplicaManagerHarness.sol
@@ -21,6 +21,10 @@ contract ReplicaManagerHarness is ReplicaManager {
  _addNotary(_domain, _notary);
  }
 
+ function isNotary(uint32 _domain, address _notary) public view returns (bool) {
+ return _isNotary(_domain, _notary);
+ }
+
  function setSensitiveValue(uint256 _newValue) external onlySystemMessenger {
  sensitiveValue = _newValue;
  }