Commit 774dd1b9 authored by Maurelian's avatar Maurelian

safe-tools: Fix bug in getPrevOwners

parent 5f56bd2c
...@@ -199,14 +199,7 @@ library SafeTestLib { ...@@ -199,14 +199,7 @@ library SafeTestLib {
/// @param _owner The owner whose previous owner we want to find /// @param _owner The owner whose previous owner we want to find
function getPrevOwner(SafeInstance memory instance, address _owner) internal view returns (address prevOwner_) { function getPrevOwner(SafeInstance memory instance, address _owner) internal view returns (address prevOwner_) {
address[] memory owners = instance.safe.getOwners(); address[] memory owners = instance.safe.getOwners();
for (uint256 i = 0; i < owners.length; i++) { prevOwner_ = getPrevOwnerFromList(_owner, owners);
if (owners[i] != _owner) continue;
if (i == 0) {
prevOwner_ = SENTINEL_OWNERS;
break;
}
prevOwner_ = owners[i - 1];
}
} }
/// @dev Get the previous owner in the provided list of owners. /// @dev Get the previous owner in the provided list of owners.
...@@ -250,7 +243,7 @@ library SafeTestLib { ...@@ -250,7 +243,7 @@ library SafeTestLib {
address[] memory currentOwners; address[] memory currentOwners;
for (uint256 i = 0; i < _ownersToRemove.length; i++) { for (uint256 i = 0; i < _ownersToRemove.length; i++) {
currentOwners = ownerSimulator.getOwners(); currentOwners = ownerSimulator.getOwners();
prevOwners_[i] = SafeTestLib.getPrevOwnerFromList(instance.owners[i], currentOwners); prevOwners_[i] = SafeTestLib.getPrevOwnerFromList(_ownersToRemove[i], currentOwners);
// Don't try to remove the last owner // Don't try to remove the last owner
if (currentOwners.length == 1) break; if (currentOwners.length == 1) break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment