From 1871c1879eb5fab25be76a49893102bcd3feeda6 Mon Sep 17 00:00:00 2001
From: OliverNChalk <11343499+OliverNChalk@users.noreply.github.com>
Date: Sun, 7 Jul 2024 15:09:47 -0500
Subject: [PATCH] factor out _validateTokens

---
 src/ReservoirPriceOracle.sol | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/ReservoirPriceOracle.sol b/src/ReservoirPriceOracle.sol
index 2567501..75fc344 100644
--- a/src/ReservoirPriceOracle.sol
+++ b/src/ReservoirPriceOracle.sol
@@ -192,10 +192,16 @@ contract ReservoirPriceOracle is IPriceOracle, IReservoirPriceOracle, Owned(msg.
     //                                 INTERNAL FUNCTIONS                                        //
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
-    function _validatePair(ReservoirPair aPair) internal pure {
+    function _validatePair(ReservoirPair aPair) private pure {
         if (address(aPair) == address(0)) revert OracleErrors.NoDesignatedPair();
     }
 
+    function _validateTokens(address aToken0, address aToken1) private pure {
+        // REVIEW: Can be collapsed into `if (aToken1 <= aToken1) revert`.
+        if (aToken0 == aToken1) revert OracleErrors.SameToken();
+        if (aToken1 < aToken0) revert OracleErrors.TokensUnsorted();
+    }
+
     function _getTimeWeightedAverageSingle(OracleAverageQuery memory aQuery) internal view returns (uint256 rResult) {
         ReservoirPair lPair = pairs[aQuery.base][aQuery.quote];
         _validatePair(lPair);
@@ -498,8 +504,7 @@ contract ReservoirPriceOracle is IPriceOracle, IReservoirPriceOracle, Owned(msg.
     function setRoute(address aToken0, address aToken1, address[] memory aRoute) public onlyOwner {
         uint256 lRouteLength = aRoute.length;
 
-        if (aToken0 == aToken1) revert OracleErrors.SameToken();
-        if (aToken1 < aToken0) revert OracleErrors.TokensUnsorted();
+        _validateTokens(aToken0, aToken1);
         if (lRouteLength > Constants.MAX_ROUTE_LENGTH || lRouteLength < 2) revert OracleErrors.InvalidRouteLength();
         if (aRoute[0] != aToken0 || aRoute[lRouteLength - 1] != aToken1) revert OracleErrors.InvalidRoute();
 
@@ -546,8 +551,7 @@ contract ReservoirPriceOracle is IPriceOracle, IReservoirPriceOracle, Owned(msg.
     }
 
     function clearRoute(address aToken0, address aToken1) external onlyOwner {
-        if (aToken0 == aToken1) revert OracleErrors.SameToken();
-        if (aToken1 < aToken0) revert OracleErrors.TokensUnsorted();
+        _validateTokens(aToken0, aToken1);
 
         (address[] memory lRoute,,) = _getRouteDecimalDifferencePrice(aToken0, aToken1);