style: error message inconsistent input

morpho-org · Aug 9, 2023 · bf7b8fb · bf7b8fb
1 parent 621a7e9
commit bf7b8fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/Blue.sol b/src/Blue.sol
@@ -143,7 +143,7 @@ contract Blue is IBlue {
     {
         Id id = market.id();
         require(lastUpdate[id] != 0, Errors.MARKET_NOT_CREATED);
-        require((shares == 0 && amount > 0) || (shares > 0 && amount == 0));
+        require((shares == 0 && amount > 0) || (shares > 0 && amount == 0), Errors.INCONSISTENT_INPUT);
         require(onBehalf != address(0), Errors.ZERO_ADDRESS);
 
         _accrueInterests(market, id);
@@ -170,7 +170,7 @@ contract Blue is IBlue {
     {
         Id id = market.id();
         require(lastUpdate[id] != 0, Errors.MARKET_NOT_CREATED);
-        require((shares == 0 && amount > 0) || (shares > 0 && amount == 0));
+        require((shares == 0 && amount > 0) || (shares > 0 && amount == 0), Errors.INCONSISTENT_INPUT);
         // No need to verify that onBehalf != address(0) thanks to the authorization check.
         require(receiver != address(0), Errors.ZERO_ADDRESS);
         require(_isSenderAuthorized(onBehalf), Errors.UNAUTHORIZED);
@@ -201,7 +201,7 @@ contract Blue is IBlue {
     {
         Id id = market.id();
         require(lastUpdate[id] != 0, Errors.MARKET_NOT_CREATED);
-        require((shares == 0 && amount > 0) || (shares > 0 && amount == 0));
+        require((shares == 0 && amount > 0) || (shares > 0 && amount == 0), Errors.INCONSISTENT_INPUT);
         // No need to verify that onBehalf != address(0) thanks to the authorization check.
         require(receiver != address(0), Errors.ZERO_ADDRESS);
         require(_isSenderAuthorized(onBehalf), Errors.UNAUTHORIZED);
@@ -231,7 +231,7 @@ contract Blue is IBlue {
     {
         Id id = market.id();
         require(lastUpdate[id] != 0, Errors.MARKET_NOT_CREATED);
-        require((shares == 0 && amount > 0) || (shares > 0 && amount == 0));
+        require((shares == 0 && amount > 0) || (shares > 0 && amount == 0), Errors.INCONSISTENT_INPUT);
         require(onBehalf != address(0), Errors.ZERO_ADDRESS);
 
         _accrueInterests(market, id);

diff --git a/src/libraries/Errors.sol b/src/libraries/Errors.sol
@@ -18,7 +18,7 @@ library Errors {
 
     string internal constant ZERO_AMOUNT = "zero amount";
 
-    string internal constant ZERO_SHARES = "zero shares";
+    string internal constant INCONSISTENT_INPUT = "inconsistent input";
 
     string internal constant ZERO_ADDRESS = "zero address";
 

diff --git a/test/forge/Blue.t.sol b/test/forge/Blue.t.sol
@@ -712,24 +712,24 @@ contract BlueTest is
     }
 
     function testInputZero() public {
-        vm.expectRevert();
+        vm.expectRevert(bytes(Errors.INCONSISTENT_INPUT));
         blue.supply(market, 0, 0, address(this), hex"");
-        vm.expectRevert();
+        vm.expectRevert(bytes(Errors.INCONSISTENT_INPUT));
         blue.supply(market, 1, 1, address(this), hex"");
 
-        vm.expectRevert();
+        vm.expectRevert(bytes(Errors.INCONSISTENT_INPUT));
         blue.withdraw(market, 0, 0, address(this), address(this));
-        vm.expectRevert();
+        vm.expectRevert(bytes(Errors.INCONSISTENT_INPUT));
         blue.withdraw(market, 1, 1, address(this), address(this));
 
-        vm.expectRevert();
+        vm.expectRevert(bytes(Errors.INCONSISTENT_INPUT));
         blue.borrow(market, 0, 0, address(this), address(this));
-        vm.expectRevert();
-        blue.borrow(market, 0, 1, address(this), address(this));
+        vm.expectRevert(bytes(Errors.INCONSISTENT_INPUT));
+        blue.borrow(market, 1, 1, address(this), address(this));
 
-        vm.expectRevert();
+        vm.expectRevert(bytes(Errors.INCONSISTENT_INPUT));
         blue.repay(market, 0, 0, address(this), hex"");
-        vm.expectRevert();
+        vm.expectRevert(bytes(Errors.INCONSISTENT_INPUT));
         blue.repay(market, 1, 1, address(this), hex"");
 
         vm.expectRevert(bytes(Errors.ZERO_AMOUNT));