Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

correct hasSaleEnded #11

Merged
merged 2 commits into from Nov 4, 2017
Merged

Conversation

benjaminbollen
Copy link
Contributor

correct hasSaleEnded to correct for paused, but not yet ended sale condition

Copy link
Contributor

@jasonklein jasonklein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seeing your fix helped me to better understand the issue. Thanks!

I did not "Approve" because I have two suggested changes, but I am not OK with requiring them, so I'm also not marking "Request changes".

// and endtime has past, then sale has ended
} else if (pausedTime == 0 && currentTime() >= endTime) {
return true;
// otherwise it not past and not paused; or paused
Copy link
Contributor

@jasonklein jasonklein Nov 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest adding "is": "... otherwise it is not past and not paused ..."

// otherwise it not past and not paused; or paused
// and as such not ended
} else {
return false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that hasSaleEnded will return false if the sale is paused and we have past the original endTime, updateWhitelist should probably stet require(!hasSaleEnded()), because otherwise the whitelist can be updated after the sale ends but before it is finalized.

Thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great point; will make said changes.

Copy link
Contributor

@jasonklein jasonklein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@acote88 acote88 merged commit ac1b56c into master Nov 4, 2017
@acote88 acote88 deleted the benjaminbollen/ch112/correct-hassaleended branch November 4, 2017 07:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants