Skip to content

Commit cd988de

Browse files
author
Oren Sokolowsky
committed
spelling
1 parent d45934f commit cd988de

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

contracts/schemes/Join.sol

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ contract Join is
1919
using SafeERC20 for IERC20;
2020
using StringUtil for string;
2121

22-
enum MemeberState { None, Candidate, Accepted, Rejected, ReputationRedeemed }
22+
enum MemberState { None, Candidate, Accepted, Rejected, ReputationRedeemed }
2323

2424
event JoinInProposal(
2525
address indexed _avatar,
@@ -47,7 +47,7 @@ contract Join is
4747
}
4848

4949
mapping(bytes32=>Proposal) public proposals;
50-
mapping(address=>MemeberState) public membersState;
50+
mapping(address=>MemberState) public membersState;
5151

5252
IERC20 public fundingToken;
5353
uint256 public minFeeToJoin;
@@ -104,12 +104,12 @@ contract Join is
104104
returns(bool) {
105105
Proposal memory proposal = proposals[_proposalId];
106106
require(proposal.proposedMember != address(0), "not a valid proposal");
107-
require(membersState[proposal.proposedMember] == MemeberState.Candidate, "proposal already been executed");
107+
require(membersState[proposal.proposedMember] == MemberState.Candidate, "member is not a cadidate");
108108

109109
bool success;
110110
// Check if vote was successful:
111111
if ((_decision == 1) && (avatar.nativeReputation().balanceOf(proposal.proposedMember) == 0)) {
112-
membersState[proposal.proposedMember] = MemeberState.Accepted;
112+
membersState[proposal.proposedMember] = MemberState.Accepted;
113113
totalDonation = totalDonation.add(proposal.funding);
114114
if (fundingToken == IERC20(0)) {
115115
// solhint-disable-next-line
@@ -121,7 +121,7 @@ contract Join is
121121
//this should be called/check after the transfer to the avatar.
122122
setFundingGoalReachedFlag();
123123
} else {
124-
membersState[proposal.proposedMember] = MemeberState.Rejected;
124+
membersState[proposal.proposedMember] = MemberState.Rejected;
125125
if (fundingToken == IERC20(0)) {
126126
// solhint-disable-next-line
127127
(success, ) = proposal.proposedMember.call{value:proposal.funding}("");
@@ -150,11 +150,11 @@ contract Join is
150150
returns(bytes32)
151151
{
152152
address proposer = msg.sender;
153-
require(membersState[proposer] != MemeberState.Candidate, "already a candidate");
154-
require(membersState[proposer] != MemeberState.Accepted, "accepted and not redeemed yet");
155-
require(avatar.nativeReputation().balanceOf(proposer) == 0, "already a member");
156-
require(_feeAmount >= minFeeToJoin, "_feeAmount should be >= then the minFeeToJoin");
157-
membersState[proposer] = MemeberState.Candidate;
153+
require(membersState[proposer] != MemberState.Candidate, "proposer is already a candidate");
154+
require(membersState[proposer] != MemberState.Accepted, "proposer is accepted and not redeemed yet");
155+
require(avatar.nativeReputation().balanceOf(proposer) == 0, "proposer is already a member");
156+
require(_feeAmount >= minFeeToJoin, "_feeAmount should be >= than the minFeeToJoin");
157+
membersState[proposer] = MemberState.Candidate;
158158
if (fundingToken == IERC20(0)) {
159159
require(_feeAmount == msg.value, "ETH received should match the _feeAmount");
160160
} else {
@@ -188,11 +188,11 @@ contract Join is
188188
function redeemReputation(bytes32 _proposalId) public returns(uint256 reputation) {
189189
Proposal memory proposal = proposals[_proposalId];
190190
require(proposal.proposedMember != address(0), "no member to redeem");
191-
require(membersState[proposal.proposedMember] == MemeberState.Accepted, "member not accepeted");
191+
require(membersState[proposal.proposedMember] == MemberState.Accepted, "member not accepted");
192192
//set proposal proposedMember to zero to prevent reentrancy attack.
193193
proposals[_proposalId].proposedMember = address(0);
194194
proposals[_proposalId].proposedMember = address(0);
195-
membersState[proposal.proposedMember] = MemeberState.ReputationRedeemed;
195+
membersState[proposal.proposedMember] = MemberState.ReputationRedeemed;
196196
if (memberReputation == 0) {
197197
reputation = proposal.funding;
198198
} else {

0 commit comments

Comments
 (0)