rename systemRewardRatio to initSystemRewardRatio in tests

bnb-chain · May 22, 2024 · 643e917 · 643e917
1 parent 03c6d3c
commit 643e917
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/test/SlashIndicator.t.sol b/test/SlashIndicator.t.sol
@@ -8,7 +8,7 @@ contract SlashIndicatorTest is Deployer {
 
     uint256 public burnRatio;
     uint256 public burnRatioScale;
-    uint256 public systemRewardRatio;
+    uint256 public initSystemRewardRatio;
     uint256 public systemRewardRatioScale;
 
     address public coinbase;
@@ -19,8 +19,8 @@ contract SlashIndicatorTest is Deployer {
             bscValidatorSet.isSystemRewardIncluded() ? bscValidatorSet.burnRatio() : bscValidatorSet.INIT_BURN_RATIO();
         burnRatioScale = bscValidatorSet.BLOCK_FEES_RATIO_SCALE();
 
-        systemRewardRatio = bscValidatorSet.isSystemRewardIncluded()
-            ? bscValidatorSet.systemRewardRatio()
+        initSystemRewardRatio = bscValidatorSet.isSystemRewardIncluded()
+            ? bscValidatorSet.initSystemRewardRatio()
             : bscValidatorSet.INIT_SYSTEM_REWARD_RATIO();
         systemRewardRatioScale = bscValidatorSet.BLOCK_FEES_RATIO_SCALE();
 
@@ -356,7 +356,7 @@ contract SlashIndicatorTest is Deployer {
     }
 
     function _calcIncoming(uint256 value) internal view returns (uint256 incoming) {
-        uint256 toSystemReward = (value * systemRewardRatio) / systemRewardRatioScale;
+        uint256 toSystemReward = (value * initSystemRewardRatio) / systemRewardRatioScale;
         uint256 toBurn = (value * burnRatio) / burnRatioScale;
         incoming = value - toSystemReward - toBurn;
     }

diff --git a/test/ValidatorSet.t.sol b/test/ValidatorSet.t.sol
@@ -23,7 +23,7 @@ contract ValidatorSetTest is Deployer {
     uint256 public burnRatioScale;
     uint256 public maxNumOfWorkingCandidates;
     uint256 public numOfCabinets;
-    uint256 public systemRewardRatio;
+    uint256 public initSystemRewardRatio;
     uint256 public systemRewardRatioScale;
 
     address public coinbase;
@@ -42,8 +42,8 @@ contract ValidatorSetTest is Deployer {
         burnRatio =
             bscValidatorSet.isSystemRewardIncluded() ? bscValidatorSet.burnRatio() : bscValidatorSet.INIT_BURN_RATIO();
         burnRatioScale = bscValidatorSet.BLOCK_FEES_RATIO_SCALE();
-        systemRewardRatio = bscValidatorSet.isSystemRewardIncluded()
-            ? bscValidatorSet.systemRewardRatio()
+        initSystemRewardRatio = bscValidatorSet.isSystemRewardIncluded()
+            ? bscValidatorSet.initSystemRewardRatio()
             : bscValidatorSet.INIT_SYSTEM_REWARD_RATIO();
         systemRewardRatioScale = bscValidatorSet.BLOCK_FEES_RATIO_SCALE();
         totalInComing = bscValidatorSet.totalInComing();
@@ -615,7 +615,7 @@ contract ValidatorSetTest is Deployer {
     }
 
     function _calcIncoming(uint256 value) internal view returns (uint256 incoming) {
-        uint256 toSystemReward = (value * systemRewardRatio) / systemRewardRatioScale;
+        uint256 toSystemReward = (value * initSystemRewardRatio) / systemRewardRatioScale;
         uint256 toBurn = (value * burnRatio) / burnRatioScale;
         incoming = value - toSystemReward - toBurn;
     }

diff --git a/test/utils/interface/IBSCValidatorSet.sol b/test/utils/interface/IBSCValidatorSet.sol
@@ -108,6 +108,7 @@ interface BSCValidatorSet {
     function handleFailAckPackage(uint8 channelId, bytes memory msgBytes) external;
     function handleSynPackage(uint8, bytes memory msgBytes) external returns (bytes memory responsePayload);
     function init() external;
+    function initSystemRewardRatio() external view returns (uint256);
     function isCurrentValidator(address validator) external view returns (bool);
     function isMonitoredForMaliciousVote(bytes memory voteAddr) external view returns (bool);
     function isSystemRewardIncluded() external view returns (bool);
@@ -124,7 +125,6 @@ interface BSCValidatorSet {
     function previousHeight() external view returns (uint256);
     function previousVoteAddrFullSet(uint256) external view returns (bytes memory);
     function removeTmpMigratedValidator(address validator) external;
-    function systemRewardRatio() external view returns (uint256);
     function totalInComing() external view returns (uint256);
     function updateParam(string memory key, bytes memory value) external;
     function updateValidatorSetV2(