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

Separate ERC721Mintable #1365

Merged
merged 5 commits into from
Oct 4, 2018
Merged

Conversation

frangio
Copy link
Contributor

@frangio frangio commented Sep 28, 2018

We used to have only one ERC721Mintable that required to be plugged into an ERC721Full. This change allows making a more minimal ERC721 mintable.

@frangio frangio added feature New contracts, functions, or helpers. contracts Smart contract code. labels Sep 28, 2018
@frangio frangio added this to the v2.0 milestone Sep 28, 2018
@frangio frangio requested a review from nventuro September 28, 2018 14:47
@frangio frangio force-pushed the 721-metadata-mintable branch from 758ae20 to dc28c9a Compare September 28, 2018 18:45
@frangio frangio force-pushed the 721-metadata-mintable branch from dc28c9a to d10add4 Compare September 28, 2018 18:48


/**
* @title ERC721Mintable
Copy link
Contributor

Choose a reason for hiding this comment

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

This should now read ERC721MetadataMintable

@@ -1,13 +1,13 @@
pragma solidity ^0.4.24;

import "./ERC721Full.sol";
import "./ERC721Metadata.sol";
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be ERC721?

@@ -2,14 +2,15 @@ pragma solidity ^0.4.24;

import "../token/ERC721/ERC721Full.sol";
import "../token/ERC721/ERC721Mintable.sol";
import "../token/ERC721/ERC721MetadataMintable.sol";
import "../token/ERC721/ERC721Burnable.sol";

/**
* @title ERC721Mock
Copy link
Contributor

@nventuro nventuro Oct 1, 2018

Choose a reason for hiding this comment

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

This is now ERC721FullMock

@frangio
Copy link
Contributor Author

frangio commented Oct 1, 2018

@nventuro I got coverage back up at 100%. There were two tests testing the wrong thing.

@nventuro nventuro merged commit 744f567 into OpenZeppelin:master Oct 4, 2018
nventuro pushed a commit that referenced this pull request Oct 4, 2018
* separate part of ERC721Mintable into ERC721MetadataMintable

* remove mint and burn from 721 tests

* Fixed linter error.

* fix ERC721 mint tests

* Minor fixes.

(cherry picked from commit 744f567)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contracts Smart contract code. feature New contracts, functions, or helpers.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants