Remove duplicated isReportValidatorValid function

poanetwork · Mar 18, 2021 · ec26d7d · ec26d7d
1 parent aaacae2
commit ec26d7d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/contracts/Certifier.sol b/contracts/Certifier.sol
@@ -90,7 +90,7 @@ contract Certifier is UpgradeableOwned, ICertifier {
         if (_certified[_who]) {
             return true;
         }
-        return validatorSetContract.isReportValidatorValid(_who);
+        return validatorSetContract.isReportValidatorValid(_who, true);
     }
 
     /// @dev Returns a boolean flag indicating whether the specified address is allowed to use zero gas price

diff --git a/contracts/ValidatorSetAuRa.sol b/contracts/ValidatorSetAuRa.sol
@@ -666,12 +666,6 @@ contract ValidatorSetAuRa is UpgradeabilityAdmin, IValidatorSetAuRa {
         return isValidatorById[idByMiningAddress[_miningAddress]];
     }
 
-    /// @dev See the description of isReportValidatorValid(address,bool) below.
-    /// Used for backward compatibility with the Certifier contract.
-    function isReportValidatorValid(address _miningAddress) public view returns(bool) {
-        return isReportValidatorValid(_miningAddress, true);
-    }
-
     /// @dev Returns a boolean flag indicating whether the specified validator (mining address)
     /// is able to call the `reportMalicious` function or whether the specified validator (mining address)
     /// can be reported as malicious. This function also allows a validator to call the `reportMalicious`

diff --git a/contracts/interfaces/IValidatorSetAuRa.sol b/contracts/interfaces/IValidatorSetAuRa.sol
@@ -25,7 +25,6 @@ interface IValidatorSetAuRa {
     function hasEverBeenMiningAddress(address) external view returns(uint256);
     function idByMiningAddress(address) external view returns(uint256);
     function idByStakingAddress(address) external view returns(uint256);
-    function isReportValidatorValid(address) external view returns(bool);
     function isReportValidatorValid(address, bool) external view returns(bool);
     function isValidator(address) external view returns(bool);
     function isValidatorById(uint256) external view returns(bool);