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.

Sign up for GitHub

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

Jump to bottom

Replaces amount with value for consistency #1378

Merged
merged 17 commits into from
Oct 4, 2018
Merged

Replaces amount with value for consistency #1378

merged 17 commits into from
Oct 4, 2018

Conversation

Aniket-Engg
Copy link
Contributor

@Aniket-Engg Aniket-Engg commented Oct 4, 2018 •
edited
Loading

Fixes #1372
Replaces all the occurence of amount with value in ERC20.sol . Related test cases are using amount throughout so left as it is.

nventuro
nventuro reviewed Oct 4, 2018
View reviewed changes
Copy link
Contributor

@nventuro nventuro left a comment

Choose a reason for hiding this comment

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

Thanks for taking care of this @Aniket-Engg! The changeset looks good, but could you also add ERC20Mintable to this PR, for completeness sake?

@Aniket-Engg
Copy link
Contributor Author

@nventuro can you please analyse travis logs? Why it is showing warning sign in unit tests?

@nventuro
Copy link
Contributor

nventuro commented Oct 4, 2018

That failure was a false negative, related to #1340 (which I haven't been able to properly investigate yet :/). Thanks a lot @Aniket-Engg!

@nventuro nventuro merged commit fd4de77 into OpenZeppelin:master Oct 4, 2018
@Aniket-Engg
Copy link
Contributor Author

That failure was a false negative, related to #1340 (which I haven't been able to properly investigate yet :/). Thanks a lot @Aniket-Engg!

Ok. It's always my pleasure to contribute :)

@Aniket-Engg Aniket-Engg deleted the fix/#1372 branch October 4, 2018 10:52
come-maiz pushed a commit that referenced this pull request Oct 21, 2018
@Aniket-Engg @come-maiz
Replaces amount with value for consistency (#1378)
109eba9 
* fixes #1372

* done in ERC20Capped and ERC20Mintable

(cherry picked from commit fd4de77)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nventuro nventuro nventuro approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Code Styling: ERC20.sol amount vs value
2 participants
@Aniket-Engg @nventuro