Test order-clearer and order context words for both orders in clear3

Closes #2936

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: thedavidmeister

test/concrete/raindex/RaindexV6.contextWordEntrypoints.t.sol

@@ -181,8 +181,14 @@ contract RaindexV6ContextWordEntrypointsTest is RaindexV6ExternalRealTest {
     }
 
     /// `CLEARER` clears an ACTOR order whose calculate source is `calculate` and
-    /// handle source is `handle` against a TAKER order.
-    function doClear(string memory calculate, string memory handle) public {
+    /// handle source is `handle` against a TAKER order whose calculate source is
+    /// `bobCalculate` and handle source is `bobHandle`.
+    function doClear(
+        string memory calculate,
+        string memory handle,
+        string memory bobCalculate,
+        string memory bobHandle
+    ) public {
         vm.mockCall(address(iToken0), abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true));
         vm.mockCall(address(iToken1), abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true));
         vm.prank(ACTOR);
@@ -200,7 +206,13 @@ contract RaindexV6ContextWordEntrypointsTest is RaindexV6ExternalRealTest {
             VAULT_ID
         );
         OrderV4 memory bob = LibTestTakeOrder.addOrderWithExpression(
-            vm, TAKER, "_ _:1 1;:;", address(iToken1), VAULT_ID, address(iToken0), VAULT_ID
+            vm,
+            TAKER,
+            bytes(string.concat("using-words-from ", address(iSubParser).toHexString(), "\n", bobCalculate, bobHandle)),
+            address(iToken1),
+            VAULT_ID,
+            address(iToken0),
+            VAULT_ID
         );
         vm.prank(CLEARER);
         iRaindex.clear3(alice, bob, ClearConfigV2(0, 0, 0, 0, 0, 0), new SignedContextV1[](0), new SignedContextV1[](0));
@@ -379,11 +391,29 @@ contract RaindexV6ContextWordEntrypointsTest is RaindexV6ExternalRealTest {
         checks[4] = Check("order-clearer()", CLEARER.toHexString());
     }
 
+    function bobClearChecks() internal view returns (Check[] memory checks) {
+        checks = new Check[](5);
+        checks[0] = raindexCheck();
+        checks[1] = senderCheck(CLEARER);
+        checks[2] = Check("order-owner()", TAKER.toHexString());
+        checks[3] = Check("order-counterparty()", ACTOR.toHexString());
+        checks[4] = Check("order-clearer()", CLEARER.toHexString());
+    }
+
     function testClearCalculateContextWords() external {
-        this.doClear(string.concat("_ _:1 1,", ensures(clearChecks())), ":;");
+        this.doClear(string.concat("_ _:1 1,", ensures(clearChecks())), ":;", "_ _:1 1;", ":;");
     }
 
     function testClearHandleIOContextWords() external {
-        this.doClear("_ _:1 1;", ensures(clearChecks()));
+        this.doClear("_ _:1 1;", ensures(clearChecks()), "_ _:1 1;", ":;");
+    }
+
+    function testClearBothOrdersContextWords() external {
+        this.doClear(
+            string.concat("_ _:1 1,", ensures(clearChecks())),
+            ensures(clearChecks()),
+            string.concat("_ _:1 1,", ensures(bobClearChecks())),
+            ensures(bobClearChecks())
+        );
     }
 }