Addressing code review comments

Author: ahnaguib

contracts/UFragmentsPolicy.sol

@@ -344,17 +344,24 @@ contract UFragmentsPolicy is Ownable {
         int256 normalizedRate = rate.toInt256Safe().mul(ONE).div(targetRateSigned);
 
         // Determine growth and bounds based on positive or negative rebase
-        int256 growth = normalizedRate >= ONE
-            ? rebaseFunctionPositiveGrowth
-            : rebaseFunctionNegativeGrowth;
-        int256 lower = normalizedRate >= ONE
-            ? -rebaseFunctionUpperPercentage
-            : rebaseFunctionLowerPercentage;
-        int256 upper = normalizedRate >= ONE
-            ? rebaseFunctionUpperPercentage
-            : -rebaseFunctionLowerPercentage;
-
-        int256 rebasePercentage = computeRebasePercentage(normalizedRate, lower, upper, growth);
+        int256 rebasePercentage;
+
+        if (normalizedRate >= ONE) {
+            rebasePercentage = computeRebasePercentage(normalizedRate, -rebaseFunctionUpperPercentage, rebaseFunctionUpperPercentage, rebaseFunctionPositiveGrowth);
+        } else {
+            rebasePercentage = computeRebasePercentage(normalizedRate, rebaseFunctionLowerPercentage, -rebaseFunctionLowerPercentage, rebaseFunctionNegativeGrowth);
+        }
+        // int256 growth = normalizedRate >= ONE
+        //     ? rebaseFunctionPositiveGrowth
+        //     : rebaseFunctionNegativeGrowth;
+        // int256 lower = normalizedRate >= ONE
+        //     ? -rebaseFunctionUpperPercentage
+        //     : rebaseFunctionLowerPercentage;
+        // int256 upper = normalizedRate >= ONE
+        //     ? rebaseFunctionUpperPercentage
+        //     : -rebaseFunctionLowerPercentage;
+
+        // int256 rebasePercentage = computeRebasePercentage(normalizedRate, lower, upper, growth);
         return uFrags.totalSupply().toInt256Safe().mul(rebasePercentage).div(ONE);
     }
 

test/unit/UFragmentsPolicy.ts

@@ -1036,15 +1036,18 @@ describe('UFragmentsPolicy:Rebase', async function () {
       )
       await uFragmentsPolicy
         .connect(deployer)
-        .setRebaseFunctionPositiveGrowth('50' + '000000000000000000') // Positive growth
+        .setRebaseFunctionPositiveGrowth('25' + '000000000000000000') // Positive growth
+      await uFragmentsPolicy
+        .connect(deployer)
+        .setRebaseFunctionUpperPercentage('10' + '0000000000000000')
       await increaseTime(60)
     })
 
     it('should compute positive rebase percentage correctly', async function () {
       const rebaseEvent = await parseRebaseEvent(
         uFragmentsPolicy.connect(orchestrator).rebase(),
       )
-      expect(rebaseEvent.requestedSupplyAdjustment).to.eq(0)
+      expect(rebaseEvent.requestedSupplyAdjustment).to.eq(98)
     })
   })
 
@@ -1065,7 +1068,7 @@ describe('UFragmentsPolicy:Rebase', async function () {
       const rebaseEvent = await parseRebaseEvent(
         uFragmentsPolicy.connect(orchestrator).rebase(),
       )
-      expect(rebaseEvent.requestedSupplyAdjustment).to.eq(0)
+      expect(rebaseEvent.requestedSupplyAdjustment).to.eq(-76);
     })
   })