status-im
/
liquid-funding
mirror of https://github.com/status-im/liquid-funding.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix idx Inconsistencies

This commit is contained in:
Arthur L Lunn 2017-12-03 02:43:16 +01:00
parent 9f105876a8
commit e450358f0b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contracts/LiquidPledgingBase.sol
View File

@ -185,11 +185,11 @@ contract LiquidPledgingBase is Owned {
string url, string url,
uint64 commitTime, uint64 commitTime,
ILiquidPledgingPlugin plugin ILiquidPledgingPlugin plugin
) returns (uint64 idxDelegate) { ) returns (uint64 idDelegate) {
require(isValidPlugin(plugin)); // Plugin check require(isValidPlugin(plugin)); // Plugin check
idxDelegate = uint64(admins.length); idDelegate = uint64(admins.length);
admins.push(PledgeAdmin( admins.push(PledgeAdmin(
PledgeAdminType.Delegate, PledgeAdminType.Delegate,
@ -201,15 +201,15 @@ contract LiquidPledgingBase is Owned {
false, false,
plugin)); plugin));
DelegateAdded(idxDelegate); DelegateAdded(idDelegate);
} }
event DelegateAdded(uint64 indexed idxDelegate); event DelegateAdded(uint64 indexed idDelegate);
/// @notice Updates a Delegate's info to change the address, name, url, or /// @notice Updates a Delegate's info to change the address, name, url, or
/// commitTime, it cannot be used to change a plugin, and it must be called /// commitTime, it cannot be used to change a plugin, and it must be called
/// by the current address of the Delegate /// by the current address of the Delegate
/// @param idxDelegate The Admin id number used to specify the Delegate /// @param idDelegate The Admin id number used to specify the Delegate
/// @param newAddr The new address that represents this Delegate /// @param newAddr The new address that represents this Delegate
/// @param newName The new name used to identify the Delegate /// @param newName The new name used to identify the Delegate
/// @param newUrl The new link to the Delegate's profile often an IPFS hash /// @param newUrl The new link to the Delegate's profile often an IPFS hash
@ -218,22 +218,22 @@ contract LiquidPledgingBase is Owned {
/// the time allowed to veto any event must be greater than or equal to /// the time allowed to veto any event must be greater than or equal to
/// this time. /// this time.
function updateDelegate( function updateDelegate(
uint64 idxDelegate, uint64 idDelegate,
address newAddr, address newAddr,
string newName, string newName,
string newUrl, string newUrl,
uint64 newCommitTime) { uint64 newCommitTime) {
PledgeAdmin storage delegate = findAdmin(idxDelegate); PledgeAdmin storage delegate = findAdmin(idDelegate);
require(delegate.adminType == PledgeAdminType.Delegate); require(delegate.adminType == PledgeAdminType.Delegate);
require(delegate.addr == msg.sender);// Current addr had to send this tx require(delegate.addr == msg.sender);// Current addr had to send this tx
delegate.addr = newAddr; delegate.addr = newAddr;
delegate.name = newName; delegate.name = newName;
delegate.url = newUrl; delegate.url = newUrl;
delegate.commitTime = newCommitTime; delegate.commitTime = newCommitTime;
DelegateUpdated(idxDelegate); DelegateUpdated(idDelegate);
} }
event DelegateUpdated(uint64 indexed idxDelegate); event DelegateUpdated(uint64 indexed idDelegate);
/// @notice Creates a Project Admin with the `msg.sender` as the Admin addr /// @notice Creates a Project Admin with the `msg.sender` as the Admin addr
/// @param name The name used to identify the Project /// @param name The name used to identify the Project
@ -468,7 +468,7 @@ contract LiquidPledgingBase is Owned {
/// `admins` array index `idxDelegae` this returns that delegates /// `admins` array index `idxDelegae` this returns that delegates
/// corresponding index in the delegationChain. Otherwise it returns /// corresponding index in the delegationChain. Otherwise it returns
/// the maximum address. /// the maximum address.
function getDelegateIdx(Pledge n, uint64 idxDelegate) internal returns(uint64) { function getDelegateId(Pledge n, uint64 idxDelegate) internal returns(uint64) {
for (uint i=0; i<n.delegationChain.length; i++) { for (uint i=0; i<n.delegationChain.length; i++) {
if (n.delegationChain[i] == idxDelegate) return uint64(i); if (n.delegationChain[i] == idxDelegate) return uint64(i);
} }