Adapt the tests for the interface changes

synapsecns · Oct 31, 2023 · 0babf04 · 0babf04
1 parent da554b4
commit 0babf04
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/packages/contracts-core/test/mocks/DestinationMock.t.sol b/packages/contracts-core/test/mocks/DestinationMock.t.sol
@@ -10,7 +10,7 @@ contract DestinationMock is ExecutionHubMock, AgentSecuredMock, InterfaceDestina
     /// @notice Prevents this contract from being included in the coverage report
     function testDestinationMock() external {}
 
-    function passAgentRoot() external returns (bool rootPassed, bool rootPending) {}
+    function passAgentRoot() external returns (bool rootPending) {}
 
     function acceptAttestation(
         uint32 notaryIndex,

diff --git a/packages/contracts-core/test/suite/Destination.t.sol b/packages/contracts-core/test/suite/Destination.t.sol
@@ -41,8 +41,7 @@ contract DestinationTest is ExecutionHubTest {
         // Check version
         assertEq(dst.version(), LATEST_VERSION, "!version");
         // Check pending Agent Merkle Root
-        (bool rootPassed, bool rootPending) = dst.passAgentRoot();
-        assertFalse(rootPassed);
+        (bool rootPending) = dst.passAgentRoot();
         assertFalse(rootPending);
     }
 
@@ -332,8 +331,7 @@ contract DestinationTest is ExecutionHubTest {
         test_submitAttestation_updatesAgentRoot(ra, rootSubmittedAt);
         timePassed = timePassed % AGENT_ROOT_OPTIMISTIC_PERIOD;
         skip(timePassed);
-        (bool rootPassed, bool rootPending) = InterfaceDestination(localDestination()).passAgentRoot();
-        assertFalse(rootPassed);
+        bool rootPending = InterfaceDestination(localDestination()).passAgentRoot();
         assertTrue(rootPending);
         assertEq(lightManager.agentRoot(), agentRootLM);
     }
@@ -342,8 +340,7 @@ contract DestinationTest is ExecutionHubTest {
         // Submit attestation that updates `nextAgentRoot`
         test_submitAttestation_updatesAgentRoot(ra, rootSubmittedAt);
         skip(AGENT_ROOT_OPTIMISTIC_PERIOD);
-        (bool rootPassed, bool rootPending) = InterfaceDestination(localDestination()).passAgentRoot();
-        assertTrue(rootPassed);
+        bool rootPending = InterfaceDestination(localDestination()).passAgentRoot();
         assertFalse(rootPending);
         assertEq(lightManager.agentRoot(), ra._agentRoot);
     }
@@ -377,9 +374,8 @@ contract DestinationTest is ExecutionHubTest {
         bytes32 oldRoot = lightManager.agentRoot();
         prepareAgentRootDisputeTest();
         skip(AGENT_ROOT_OPTIMISTIC_PERIOD - 1);
-        (bool rootPassed, bool rootPending) = InterfaceDestination(localDestination()).passAgentRoot();
+        bool rootPending = InterfaceDestination(localDestination()).passAgentRoot();
         // Should not pass the root
-        assertFalse(rootPassed);
         assertEq(lightManager.agentRoot(), oldRoot);
         // Should clear pending
         assertFalse(rootPending);
@@ -390,9 +386,8 @@ contract DestinationTest is ExecutionHubTest {
         bytes32 oldRoot = lightManager.agentRoot();
         prepareAgentRootDisputeTest();
         skip(AGENT_ROOT_OPTIMISTIC_PERIOD);
-        (bool rootPassed, bool rootPending) = InterfaceDestination(localDestination()).passAgentRoot();
+        bool rootPending = InterfaceDestination(localDestination()).passAgentRoot();
         // Should not pass the root
-        assertFalse(rootPassed);
         assertEq(lightManager.agentRoot(), oldRoot);
         // Should clear pending
         assertFalse(rootPending);
@@ -407,9 +402,8 @@ contract DestinationTest is ExecutionHubTest {
         skip(DISPUTE_TIMEOUT_NOTARY - 1);
         // Time since attestation was submitted: AGENT_ROOT_OPTIMISTIC_PERIOD - 1
         // Time sinceNotary won the dispute: DISPUTE_TIMEOUT_NOTARY - 1
-        (bool rootPassed, bool rootPending) = InterfaceDestination(localDestination()).passAgentRoot();
+        bool rootPending = InterfaceDestination(localDestination()).passAgentRoot();
         // Should not pass the root
-        assertFalse(rootPassed);
         assertEq(lightManager.agentRoot(), oldRoot);
         // Should not clear pending
         assertTrue(rootPending);
@@ -424,9 +418,8 @@ contract DestinationTest is ExecutionHubTest {
         skip(DISPUTE_TIMEOUT_NOTARY - 1);
         // Time since attestation was submitted: AGENT_ROOT_OPTIMISTIC_PERIOD
         // Time sinceNotary won the dispute: DISPUTE_TIMEOUT_NOTARY - 1
-        (bool rootPassed, bool rootPending) = InterfaceDestination(localDestination()).passAgentRoot();
+        bool rootPending = InterfaceDestination(localDestination()).passAgentRoot();
         // Should not pass the root
-        assertFalse(rootPassed);
         assertEq(lightManager.agentRoot(), oldRoot);
         // Should not clear pending
         assertTrue(rootPending);
@@ -441,9 +434,8 @@ contract DestinationTest is ExecutionHubTest {
         skip(DISPUTE_TIMEOUT_NOTARY);
         // Time since attestation was submitted: AGENT_ROOT_OPTIMISTIC_PERIOD - 1
         // Time sinceNotary won the dispute: DISPUTE_TIMEOUT_NOTARY
-        (bool rootPassed, bool rootPending) = InterfaceDestination(localDestination()).passAgentRoot();
+        bool rootPending = InterfaceDestination(localDestination()).passAgentRoot();
         // Should not pass the root
-        assertFalse(rootPassed);
         assertEq(lightManager.agentRoot(), oldRoot);
         // Should not clear pending
         assertTrue(rootPending);
@@ -457,9 +449,8 @@ contract DestinationTest is ExecutionHubTest {
         skip(DISPUTE_TIMEOUT_NOTARY);
         // Time since attestation was submitted: AGENT_ROOT_OPTIMISTIC_PERIOD
         // Time sinceNotary won the dispute: DISPUTE_TIMEOUT_NOTARY
-        (bool rootPassed, bool rootPending) = InterfaceDestination(localDestination()).passAgentRoot();
+        bool rootPending = InterfaceDestination(localDestination()).passAgentRoot();
         // Should pass the root
-        assertTrue(rootPassed);
         assertEq(lightManager.agentRoot(), newRoot);
         // Should clear pending
         assertFalse(rootPending);

diff --git a/packages/contracts-core/test/suite/DestinationSynapse.t.sol b/packages/contracts-core/test/suite/DestinationSynapse.t.sol
@@ -33,8 +33,7 @@ contract DestinationSynapseTest is ExecutionHubTest {
         // Check version
         assertEq(dst.version(), LATEST_VERSION, "!version");
         // Check pending Agent Merkle Root
-        (bool rootPassed, bool rootPending) = dst.passAgentRoot();
-        assertFalse(rootPassed);
+        bool rootPending = dst.passAgentRoot();
         assertFalse(rootPending);
     }