Merge c17da83 into cf53cd7

omni · Feb 20, 2020 · db011ab · db011ab
2 parents cf53cd7 + c17da83
commit db011ab
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/contracts/interfaces/IBlockReward.sol b/contracts/interfaces/IBlockReward.sol
@@ -5,7 +5,7 @@ interface IBlockReward {
     function mintedTotally() external view returns (uint256);
     function mintedTotallyByBridge(address _bridge) external view returns (uint256);
     function bridgesAllowedLength() external view returns (uint256);
-    function addBridgeTokenFeeReceivers(uint256 _amount) external;
-    function addBridgeNativeFeeReceivers(uint256 _amount) external;
+    function addBridgeTokenRewardReceivers(uint256 _amount) external;
+    function addBridgeNativeRewardReceivers(uint256 _amount) external;
     function blockRewardContractId() external pure returns (bytes4);
 }
diff --git a/contracts/mocks/BlockReward.sol b/contracts/mocks/BlockReward.sol
@@ -48,7 +48,7 @@ contract BlockReward {
         token = _token;
     }
 
-    function addBridgeNativeFeeReceivers(uint256 _amount) external {
+    function addBridgeNativeRewardReceivers(uint256 _amount) external {
         feeAmount = _amount;
         uint256 feePerValidator = _amount.div(validatorList.length);
 
@@ -67,7 +67,7 @@ contract BlockReward {
         }
     }
 
-    function addBridgeTokenFeeReceivers(uint256 _amount) external {
+    function addBridgeTokenRewardReceivers(uint256 _amount) external {
         validatorRewardList = new uint256[](validatorList.length);
         feeAmount = _amount;
         uint256 feePerValidator = _amount.div(validatorList.length);

diff --git a/contracts/upgradeable_contracts/erc20_to_erc20/FeeManagerErcToErcPOSDAO.sol b/contracts/upgradeable_contracts/erc20_to_erc20/FeeManagerErcToErcPOSDAO.sol
@@ -17,6 +17,6 @@ contract FeeManagerErcToErcPOSDAO is BlockRewardFeeManager {
 
     function distributeFeeFromBlockReward(uint256 _fee) internal {
         IBlockReward blockReward = _blockRewardContract();
-        blockReward.addBridgeTokenFeeReceivers(_fee);
+        blockReward.addBridgeTokenRewardReceivers(_fee);
     }
 }
diff --git a/contracts/upgradeable_contracts/erc20_to_native/FeeManagerErcToNativePOSDAO.sol b/contracts/upgradeable_contracts/erc20_to_native/FeeManagerErcToNativePOSDAO.sol
@@ -10,7 +10,7 @@ contract FeeManagerErcToNativePOSDAO is BlockRewardFeeManager {
 
     function distributeFeeFromBlockReward(uint256 _fee) internal {
         IBlockReward blockReward = _blockRewardContract();
-        blockReward.addBridgeNativeFeeReceivers(_fee);
+        blockReward.addBridgeNativeRewardReceivers(_fee);
     }
 
     function getAmountToBurn(uint256 _value) public view returns (uint256) {