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

Use new naming convention to call address things accounts

Browse Source 
So here we use creatorAccount - similar to proposalId.
Like this we will always have an *Account or *Id as identifier.
This commit is contained in:
bumi 2018-04-10 17:49:16 +02:00
parent 147904e237
commit e116e7ebf3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/Operator.sol
View File

@ -7,7 +7,7 @@ import './Contributors.sol';
contract Operator is Upgradeable { contract Operator is Upgradeable {
struct Proposal { struct Proposal {
address creator; address creatorAccount;
uint recipientId; uint recipientId;
uint votesCount; uint votesCount;
uint votesNeeded; uint votesNeeded;
@ -24,9 +24,9 @@ contract Operator is Upgradeable {
mapping(uint256 => Proposal) public proposals; mapping(uint256 => Proposal) public proposals;
uint256 public proposalsCount; uint256 public proposalsCount;
event ProposalCreated(uint256 id, address creator, uint recipientId, uint256 amount); event ProposalCreated(uint256 id, address creatorAccount, uint256 recipientId, uint256 amount);
event ProposalVoted(uint256 id, address voter, uint256 totalVotes); event ProposalVoted(uint256 id, uint256 contributorId, uint256 totalVotes);
event ProposalExecuted(uint256 id, uint recipientId, uint256 amount); event ProposalExecuted(uint256 id, uint256 recipientId, uint256 amount);
modifier coreOnly() { modifier coreOnly() {
require(contributorsContract().addressIsCore(msg.sender)); require(contributorsContract().addressIsCore(msg.sender));
@ -62,7 +62,7 @@ contract Operator is Upgradeable {
uint _votesNeeded = contributorsContract().coreContributorsCount() / 100 * 75; uint _votesNeeded = contributorsContract().coreContributorsCount() / 100 * 75;
var p = proposals[proposalId]; var p = proposals[proposalId];
p.creator = msg.sender; p.creatorAccount = msg.sender;
p.recipientId = recipientId; p.recipientId = recipientId;
p.amount = amount; p.amount = amount;
p.ipfsHash = ipfsHash; p.ipfsHash = ipfsHash;
@ -106,7 +106,7 @@ contract Operator is Upgradeable {
if (p.votesCount >= p.votesNeeded) { if (p.votesCount >= p.votesNeeded) {
executeProposal(proposalId); executeProposal(proposalId);
} }
ProposalVoted(proposalId, msg.sender, p.votesCount); ProposalVoted(proposalId, voterId, p.votesCount);
} }
function executeProposal(uint proposalId) private { function executeProposal(uint proposalId) private {