kredits/contracts
kredits/contracts
9
1
Fork 0
Code Issues 21 Pull Requests Actions Projects 1 Releases 8 Activity

Improve variable name clarity #210

Merged
raucao merged 1 commits from chore/variable_naming into master 2021-01-14 14:43:26 +00:00
Conversation 0 Commits 1 Files Changed 1 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/contribution/contracts/Contribution.sol
View File

@ -66,13 +66,13 @@ contract Contribution is AragonApp {
} }
function getContributorIdByAddress(address contributorAccount) public view returns (uint32) { function getContributorIdByAddress(address contributorAccount) public view returns (uint32) {
address contributor = getContract(uint8(Apps.Contributor)); address contributorContract = getContract(uint8(Apps.Contributor));
return ContributorInterface(contributor).getContributorIdByAddress(contributorAccount); return ContributorInterface(contributorContract).getContributorIdByAddress(contributorAccount);
} }
function getContributorAddressById(uint32 contributorId) public view returns (address) { function getContributorAddressById(uint32 contributorId) public view returns (address) {
address contributor = getContract(uint8(Apps.Contributor)); address contributorContract = getContract(uint8(Apps.Contributor));
return ContributorInterface(contributor).getContributorAddressById(contributorId); return ContributorInterface(contributorContract).getContributorAddressById(contributorId);
} }
// //
@ -175,7 +175,7 @@ contract Contribution is AragonApp {
emit ContributionAdded(contributionId, contributorId, amount); emit ContributionAdded(contributionId, contributorId, amount);
} }
function veto(uint32 contributionId) public isInitialized auth(VETO_CONTRIBUTION_ROLE) { function veto(uint32 contributionId) public isInitialized {
ContributionData storage c = contributions[contributionId]; ContributionData storage c = contributions[contributionId];
require(c.exists, 'NOT_FOUND'); require(c.exists, 'NOT_FOUND');
require(!c.claimed, 'ALREADY_CLAIMED'); require(!c.claimed, 'ALREADY_CLAIMED');
@ -193,10 +193,10 @@ contract Contribution is AragonApp {
require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE'); require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE');
c.claimed = true; c.claimed = true;
address token = getContract(uint8(Apps.Token)); address tokenContract = getContract(uint8(Apps.Token));
address contributorAccount = getContributorAddressById(c.contributorId); address contributorAccount = getContributorAddressById(c.contributorId);
uint256 amount = uint256(c.amount); uint256 amount = uint256(c.amount);
IToken(token).mintFor(contributorAccount, amount, contributionId); IToken(tokenContract).mintFor(contributorAccount, amount, contributionId);
emit ContributionClaimed(contributionId, c.contributorId, c.amount); emit ContributionClaimed(contributionId, c.contributorId, c.amount);
} }