Only join #780
Merged
Only join #780
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jellegerbrandy
suggested changes
Aug 4, 2020
contracts/schemes/Join.sol
Outdated
| @@ -127,13 +104,12 @@ contract JoinAndQuit is | |||
| returns(bool) { | |||
| Proposal memory proposal = proposals[_proposalId]; | |||
| require(proposal.proposedMember != address(0), "not a valid proposal"); | |||
| require(fundings[proposal.proposedMember].state == MemeberState.Candidate, "proposal already been executed"); | |||
| require(membersState[proposal.proposedMember] == MemeberState.Candidate, "proposal already been executed"); | |||
There was a problem hiding this comment.
if memberState is "candidate", that means that the proposal is already executed? Maybe change the name of the state to something more meaningful then (like "executed"?)
| @@ -127,13 +104,12 @@ contract JoinAndQuit is | |||
| returns(bool) { | |||
| Proposal memory proposal = proposals[_proposalId]; | |||
| require(proposal.proposedMember != address(0), "not a valid proposal"); | |||
There was a problem hiding this comment.
maybe give a more specific error message here?
contracts/schemes/Join.sol
Outdated
| mapping(bytes32=>Proposal) public proposals; | ||
| mapping(address=>MemberFund) public fundings; | ||
| mapping(address=>MemeberState) public membersState; |
There was a problem hiding this comment.
"MemberState" not "MemeberState"
contracts/schemes/Join.sol
Outdated
| @@ -212,11 +188,11 @@ contract JoinAndQuit is | |||
| function redeemReputation(bytes32 _proposalId) public returns(uint256 reputation) { | |||
| Proposal memory proposal = proposals[_proposalId]; | |||
| require(proposal.proposedMember != address(0), "no member to redeem"); | |||
| require(!fundings[proposal.proposedMember].rageQuit, "member already rageQuit"); | |||
| require(fundings[proposal.proposedMember].state == MemeberState.Accepted, "member not accepeted"); | |||
| require(membersState[proposal.proposedMember] == MemeberState.Accepted, "member not accepeted"); | |||
There was a problem hiding this comment.
accepted, not accepted
contracts/schemes/Join.sol
Outdated
| require(fundings[proposer].state != MemeberState.Candidate, "already a candidate"); | ||
| require(fundings[proposer].state != MemeberState.Accepted, "accepted and not redeemed yet"); | ||
| require(membersState[proposer] != MemeberState.Candidate, "already a candidate"); | ||
| require(membersState[proposer] != MemeberState.Accepted, "accepted and not redeemed yet"); | ||
| require(avatar.nativeReputation().balanceOf(proposer) == 0, "already a member"); | ||
| require(_feeAmount >= minFeeToJoin, "_feeAmount should be >= then the minFeeToJoin"); |
contracts/schemes/Join.sol
Outdated
| require(fundings[proposer].state != MemeberState.Candidate, "already a candidate"); | ||
| require(fundings[proposer].state != MemeberState.Accepted, "accepted and not redeemed yet"); | ||
| require(membersState[proposer] != MemeberState.Candidate, "already a candidate"); | ||
| require(membersState[proposer] != MemeberState.Accepted, "accepted and not redeemed yet"); |
There was a problem hiding this comment.
maybe add a subject to the error message so we know what it is about?
contracts/schemes/Join.sol
Outdated
| @@ -174,11 +150,11 @@ contract JoinAndQuit is | |||
| returns(bytes32) | |||
| { | |||
| address proposer = msg.sender; | |||
| require(fundings[proposer].state != MemeberState.Candidate, "already a candidate"); | |||
| require(fundings[proposer].state != MemeberState.Accepted, "accepted and not redeemed yet"); | |||
| require(membersState[proposer] != MemeberState.Candidate, "already a candidate"); | |||
There was a problem hiding this comment.
maybe add a subject to the error message so we know what it is about? ("proposer is already a candidate")
ben-kaufman
previously approved these changes
Aug 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.