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

Added gitsubmodule for organization contracts;SafeMath from openzeppe… #169

Merged
merged 8 commits into from
May 14, 2019
Merged

Added gitsubmodule for organization contracts;SafeMath from openzeppe… #169

merged 8 commits into from
May 14, 2019

Conversation

gulshanvasnani
Copy link
Contributor

@gulshanvasnani gulshanvasnani commented May 7, 2019 •
edited
Loading

PR contains following :

  1. Usage of gitsubmodule for organization contracts.
  2. Usage of SafeMath from openzeppelin-solidity npm package.
  3. Deleted OrganizationInterface, Organized and SafeMath contracts.

Fixes #166

@gulshanvasnani gulshanvasnani changed the title Added gitsubmodule for organization contracts;SafeMath from openzeppe… [WIP]Added gitsubmodule for organization contracts;SafeMath from openzeppe… May 7, 2019
@gulshanvasnani gulshanvasnani changed the title [WIP]Added gitsubmodule for organization contracts;SafeMath from openzeppe… Added gitsubmodule for organization contracts;SafeMath from openzeppe… May 7, 2019
@gulshanvasnani gulshanvasnani changed the title Added gitsubmodule for organization contracts;SafeMath from openzeppe… [WIP]Added gitsubmodule for organization contracts;SafeMath from openzeppe… May 7, 2019
@gulshanvasnani gulshanvasnani changed the title [WIP]Added gitsubmodule for organization contracts;SafeMath from openzeppe… Added gitsubmodule for organization contracts;SafeMath from openzeppe… May 9, 2019
@schemar schemar self-assigned this May 9, 2019
@schemar
Copy link
Contributor

schemar commented May 9, 2019

Checking 🐨

schemar
schemar suggested changes May 9, 2019
View reviewed changes
Copy link
Contributor

@schemar schemar left a comment

Choose a reason for hiding this comment

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

Thanks @gulshanvasnani, very good PR 🦏

Just one thing. You should also delete:

  • contracts/test/safe_math/SafeMathTest.sol
  • test/safe_math

See also OpenST/organization-contracts#11 (comment)

@schemar schemar removed their assignment May 9, 2019
@0xsarvesh 0xsarvesh self-assigned this May 10, 2019
0xsarvesh
0xsarvesh suggested changes May 10, 2019
View reviewed changes
Copy link
Contributor

@0xsarvesh 0xsarvesh left a comment

Choose a reason for hiding this comment

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

Nice work 👍
Please check two feedbacks inline.

contracts/BrandedToken.sol Show resolved Hide resolved
contracts/UtilityBrandedToken.sol Outdated Show resolved Hide resolved
@0xsarvesh 0xsarvesh removed their assignment May 10, 2019
@abhayks1 abhayks1 self-assigned this May 14, 2019
abhayks1
abhayks1 reviewed May 14, 2019
View reviewed changes
Copy link
Contributor

@abhayks1 abhayks1 left a comment

Choose a reason for hiding this comment

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

LGTM 👍
Added few questions/comments inline.

contracts/UtilityBrandedToken.sol Show resolved Hide resolved
contracts/test/TestUtilityBrandedToken.sol Show resolved Hide resolved
@abhayks1 abhayks1 removed their assignment May 14, 2019
@gulshanvasnani gulshanvasnani mentioned this pull request May 14, 2019
Open
0xsarvesh
0xsarvesh approved these changes May 14, 2019
View reviewed changes
Copy link
Contributor

@0xsarvesh 0xsarvesh left a comment

Choose a reason for hiding this comment

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

LGTM 🥇

abhayks1
abhayks1 approved these changes May 14, 2019
View reviewed changes
Copy link
Contributor

@abhayks1 abhayks1 left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@abhayks1 abhayks1 merged commit 13423a0 into OpenST:develop May 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deepesh-kn deepesh-kn deepesh-kn left review comments

@0xsarvesh 0xsarvesh 0xsarvesh approved these changes

@abhayks1 abhayks1 abhayks1 approved these changes

@schemar schemar schemar 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.

Use git-submodules to include SafeMath, EIP20Token, UtilityToken and Organized contracts
5 participants
@gulshanvasnani @schemar @abhayks1 @deepesh-kn @0xsarvesh