address some review comments from @nambrot

Author: lmcorbalan

solidity/src/Base7683.sol

@@ -244,7 +244,7 @@ abstract contract Base7683 is IOriginSettler, IDestinationSettler {
      * @dev Pays the filler the amount locked when the orders were opened.
      * The settled status should not be changed here but rather on the origin chain. To allow the filler to retry in
      * case some error occurs.
-     * Ensuring the order is not settled in the origin chain is the responsibility of the caller.
+     * Ensuring the order is eligible for settling in the origin chain is the responsibility of the caller.
      * @param _orderIds An array of IDs for the orders to settle.
      */
     function settle(bytes32[] calldata _orderIds) external payable {
@@ -267,7 +267,7 @@ abstract contract Base7683 is IOriginSettler, IDestinationSettler {
      * @notice Refunds a batch of expired GaslessCrossChainOrders on the chain where the orders were opened.
      * The refunded status should not be changed here but rather on the origin chain. To allow the user to retry in
      * case some error occurs.
-     * Ensuring the order is not refunded in the origin chain is the responsibility of the caller.
+     * Ensuring the order is eligible for refunding in the origin chain is the responsibility of the caller.
      * @param _orders An array of GaslessCrossChainOrders to refund.
      */
     function refund(GaslessCrossChainOrder[] memory _orders) external payable {
@@ -289,7 +289,7 @@ abstract contract Base7683 is IOriginSettler, IDestinationSettler {
      * @notice Refunds a batch of expired OnchainCrossChainOrder on the chain where the orders were opened.
      * The refunded status should not be changed here but rather on the origin chain. To allow the user to retry in
      * case some error occurs.
-     * Ensuring the order is not refunded in the origin chain is the responsibility of the caller.
+     * Ensuring the order is eligible for refunding the origin chain is the responsibility of the caller.
      * @param _orders An array of GaslessCrossChainOrders to refund.
      */
     function refund(OnchainCrossChainOrder[] memory _orders) external payable {

solidity/src/BasicSwap7683.sol

@@ -109,7 +109,7 @@ abstract contract BasicSwap7683 is Base7683 {
      */
     function _refundOrders(OnchainCrossChainOrder[] memory _orders, bytes32[] memory _orderIds) internal override {
         // at this point we are sure all orders are NOT filled, use the first order to get the originDomain
-        // if some order differs on the originDomain ir can be re-refunded later
+        // if some order differs on the originDomain it can be re-refunded later
         _dispatchRefund(OrderEncoder.decode(_orders[0].orderData).originDomain, _orderIds);
     }
 
@@ -139,11 +139,11 @@ abstract contract BasicSwap7683 is Base7683 {
         bytes32 _receiver
     ) internal virtual {
         (
-            bool validOpenOrder,
+            bool isEligible,
             OrderData memory orderData
-        ) = _isValidOpenOrder(_messageOrigin, _messageSender, _orderId);
+        ) = _checkOrderEligibility(_messageOrigin, _messageSender, _orderId);
 
-        if (!validOpenOrder) return;
+        if (!isEligible) return;
 
         orderStatus[_orderId] = SETTLED;
 
@@ -164,11 +164,11 @@ abstract contract BasicSwap7683 is Base7683 {
      */
     function _handleRefundOrder(uint32 _messageOrigin, bytes32 _messageSender, bytes32 _orderId) internal virtual {
         (
-            bool validOpenOrder,
+            bool isEligible,
             OrderData memory orderData
-        ) = _isValidOpenOrder(_messageOrigin, _messageSender, _orderId);
+        ) = _checkOrderEligibility(_messageOrigin, _messageSender, _orderId);
 
-        if (!validOpenOrder) return;
+        if (!isEligible) return;
 
         orderStatus[_orderId] = REFUNDED;
 
@@ -181,14 +181,14 @@ abstract contract BasicSwap7683 is Base7683 {
     }
 
     /**
-    * @notice Validates an open order.
-    * @dev Checks that the order is open and that its destination domain and settler match the provided parameters.
+    * @notice Checks if order is eligible for settlement or refund .
+    * @dev Order must be OPENED and the message was sent from the appropriated chain and contract.
     * @param _messageOrigin The origin domain of the message.
     * @param _messageSender The sender identifier of the message.
     * @param _orderId The unique identifier of the order.
     * @return A boolean indicating if the order is valid, and the decoded OrderData structure.
     */
-    function _isValidOpenOrder(
+    function _checkOrderEligibility(
         uint32 _messageOrigin,
         bytes32 _messageSender,
         bytes32 _orderId

solidity/test/BasicSwap7683.t.sol

@@ -159,6 +159,9 @@ contract BasicSwap7683Test is BaseTest {
 
     BasicSwap7683ForTest internal baseSwap;
 
+    uint32 internal wrongMssgOrigin = 678;
+    bytes32 internal wrongMssgSender = makeAddr("wrongMssgSender").addressToBytes32();
+
     function setUp() public override {
         super.setUp();
 
@@ -372,7 +375,7 @@ contract BasicSwap7683Test is BaseTest {
         uint256[] memory balancesBefore = _balances(inputToken);
 
         baseSwap.handleSettleOrder(
-            678,
+            wrongMssgOrigin,
             counterpart.addressToBytes32(),
             orderId,
             TypeCasts.addressToBytes32(karpincho)
@@ -395,7 +398,7 @@ contract BasicSwap7683Test is BaseTest {
 
         baseSwap.handleSettleOrder(
             destination,
-            makeAddr("wrongMssgSender").addressToBytes32(),
+            wrongMssgSender,
             orderId,
             TypeCasts.addressToBytes32(karpincho)
         );
@@ -495,7 +498,7 @@ contract BasicSwap7683Test is BaseTest {
         uint256[] memory balancesBefore = _balances(inputToken);
 
         baseSwap.handleRefundOrder(
-            678,
+            wrongMssgOrigin,
             counterpart.addressToBytes32(),
             orderId
         );
@@ -518,7 +521,7 @@ contract BasicSwap7683Test is BaseTest {
 
         baseSwap.handleRefundOrder(
             destination,
-            makeAddr("wrongMssgSender").addressToBytes32(),
+            wrongMssgSender,
             orderId
         );