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

Updated ERC1155 tests #2107

Merged
merged 8 commits into from
Aug 11, 2020
Merged

Updated ERC1155 tests #2107

merged 8 commits into from
Aug 11, 2020

Conversation

andresbach
Copy link
Member

Fixes #

ERC1155 tests has been updated.
This PR is related to the mentioned tasks in PR #2014

cag and others added 4 commits November 2, 2019 22:20
@cag @frangio
Initial ERC1155 implementation with some tests (OpenZeppelin#1803)
20642cc 
* Initial ERC1155 implementation with some tests

* Remove mocked isERC1155TokenReceiver

* Revert reason edit nit

* Remove parameters associated with isERC1155TokenReceiver call

* Add tests for approvals and single transfers

* Add tests for transferring to contracts

* Add tests for batch transfers

* Make expectEvent.inTransaction tests async

* Renamed "owner" to "account" and "holder"

* Document unspecified balanceOfBatch reversion on zero behavior

* Ensure accounts can't set their own operator status

* Specify descriptive messages for underflow errors

* Bring SafeMath.add calls in line with OZ style

* Explicitly prevent _burn on the zero account

* Implement batch minting/burning

* Refactored operator approval check into isApprovedForAll calls

* Renamed ERC1155TokenReceiver to ERC1155Receiver

* Added ERC1155Holder

* Fix lint issues
@nventuro
Merge branch 'master' into feature-erc1155
f57f16e
@nventuro
Migrate tests to @openzeppelin/test-environment
727512e
@andresbach
Updated tests
d71400d
@andresbach andresbach changed the title Updated tests Updated ERC1155 tests Mar 3, 2020
@andresbach andresbach mentioned this pull request Mar 3, 2020
Merged
6 tasks
@nventuro nventuro mentioned this pull request Mar 16, 2020
Merged
@stale
Copy link

stale bot commented Mar 18, 2020

Hi all!
This Pull Request has not had any recent activity, is it still relevant? If so, what is blocking it? Is there anything we can do to help move it forward?
Thanks!

@stale stale bot added the stale label Mar 18, 2020
@nventuro
Copy link
Contributor

Definitely relevant! We'll start ramping up work on ERC1155 next week.

@stale stale bot removed the stale label Mar 18, 2020
@stale stale bot added the stale label Apr 2, 2020
@nventuro nventuro removed the stale label Apr 2, 2020
@OpenZeppelin OpenZeppelin deleted a comment from stale bot Apr 2, 2020
@nventuro nventuro added the on hold Put on hold for some reason that must be specified in a comment. label Apr 2, 2020
@nventuro nventuro removed the on hold Put on hold for some reason that must be specified in a comment. label Jun 5, 2020
@nventuro
Copy link
Contributor

nventuro commented Jun 5, 2020

Oof, I completely missed this PR. We should review it once #2267 is in.

@frangio frangio mentioned this pull request Jun 5, 2020
Merged
@stale
Copy link

stale bot commented Jun 20, 2020

Hi all!
This Pull Request has not had any recent activity, is it still relevant? If so, what is blocking it? Is there anything we can do to help move it forward?
Thanks!

@stale stale bot added the stale label Jun 20, 2020
@frangio
Copy link
Contributor

frangio commented Jun 24, 2020

@nventuro What's the status of this PR?

@stale stale bot removed the stale label Jun 24, 2020
@nventuro
Copy link
Contributor

I'd like to wait until #2291 is in, so we can use it to guide the test development process in case we're missing coverage.

@stale
Copy link

stale bot commented Jul 12, 2020

Hi all!
This Pull Request has not had any recent activity, is it still relevant? If so, what is blocking it? Is there anything we can do to help move it forward?
Thanks!

@stale stale bot added the stale label Jul 12, 2020
@frangio
Copy link
Contributor

frangio commented Jul 13, 2020

Waiting for #2291.

@stale stale bot removed the stale label Jul 13, 2020
@stale
Copy link

stale bot commented Jul 29, 2020

Hi all!
This Pull Request has not had any recent activity, is it still relevant? If so, what is blocking it? Is there anything we can do to help move it forward?
Thanks!

@stale stale bot added the stale label Jul 29, 2020
@stale stale bot removed the stale label Aug 11, 2020
@frangio frangio changed the base branch from feature-erc1155 to master August 11, 2020 19:09
@frangio frangio merged commit 943a663 into OpenZeppelin:master Aug 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@andresbach @nventuro @frangio @cag