poanetwork
/
tokenbridge-contracts
mirror of https://github.com/poanetwork/tokenbridge-contracts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move validatorList method to RewardableValidators

This commit is contained in:
Gerardo Nardelli 2019-01-08 17:24:08 -03:00
parent 212d796412
commit fa36918944
4 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/IBridgeValidators.sol
View File

@ -5,5 +5,4 @@ interface IBridgeValidators {
function isValidator(address _validator) public view returns(bool);
function requiredSignatures() public view returns(uint256);
function owner() public view returns(address);
function validatorList() public view returns (address[]);
}

18
contracts/upgradeable_contracts/BaseBridgeValidators.sol
View File

@ -85,24 +85,6 @@ contract BaseBridgeValidators is EternalStorage, Ownable {
return addressStorage[keccak256(abi.encodePacked("validatorsList", _address))];
}
function validatorList() public view returns (address[]) {
address [] memory list = new address[](validatorCount());
uint256 counter = 0;
address nextValidator = getNextValidator(F_ADDR);
while (nextValidator != F_ADDR) {
list[counter] = nextValidator;
nextValidator = getNextValidator(nextValidator);
counter++;
if (nextValidator == address(0) ) {
revert();
}
}
return list;
}
function deleteItemFromAddressStorage(string _mapName, address _address) internal {
delete addressStorage[keccak256(abi.encodePacked(_mapName, _address))];
}

18
contracts/upgradeable_contracts/RewardableValidators.sol
View File

@ -67,6 +67,24 @@ contract RewardableValidators is BaseBridgeValidators {
emit ValidatorRemoved(_validator);
}
function validatorList() public view returns (address[]) {
address [] memory list = new address[](validatorCount());
uint256 counter = 0;
address nextValidator = getNextValidator(F_ADDR);
while (nextValidator != F_ADDR) {
list[counter] = nextValidator;
nextValidator = getNextValidator(nextValidator);
counter++;
if (nextValidator == address(0) ) {
revert();
}
}
return list;
}
function getValidatorRewardAddress(address _validator) public view returns (address) {
return addressStorage[keccak256(abi.encodePacked("validatorsRewards", _validator))];
}

15
test/validators_test.js
View File

@ -219,19 +219,4 @@ contract('BridgeValidators', async (accounts) => {
})
})
})
describe('#Validators list', () => {
it('should return validators list', async () => {
// Given
const validators = accounts.slice(0, 5)
const { initialize, validatorList } = bridgeValidators
await initialize(1, validators, owner, { from: owner }).should.be.fulfilled
// When
const returnedList = await validatorList()
// Then
returnedList.should.be.eql(validators)
})
})
})