From 91516b23180e56b870d08e5db6e804744fdff24b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Venturo?= <nicolas.venturo@gmail.com>
Date: Tue, 2 Jun 2020 15:06:34 -0300
Subject: [PATCH] Allow overriding of ERC1155 functions (#2263)

* Make receiver functions private

* Make external functions public
---
 contracts/mocks/ERC1155Mock.sol     |  8 --------
 contracts/token/ERC1155/ERC1155.sol | 24 +++++++++++-------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/contracts/mocks/ERC1155Mock.sol b/contracts/mocks/ERC1155Mock.sol
index a575bd1ac52..b6f40cd6517 100644
--- a/contracts/mocks/ERC1155Mock.sol
+++ b/contracts/mocks/ERC1155Mock.sol
@@ -24,12 +24,4 @@ contract ERC1155Mock is ERC1155 {
     function burnBatch(address owner, uint256[] memory ids, uint256[] memory values) public {
         _burnBatch(owner, ids, values);
     }
-
-    function doSafeTransferAcceptanceCheck(address operator, address from, address to, uint256 id, uint256 value, bytes memory data) public {
-        _doSafeTransferAcceptanceCheck(operator, from, to, id, value, data);
-    }
-
-    function doSafeBatchTransferAcceptanceCheck(address operator, address from, address to, uint256[] memory ids, uint256[] memory values, bytes memory data) public {
-        _doSafeBatchTransferAcceptanceCheck(operator, from, to, ids, values, data);
-    }
 }
diff --git a/contracts/token/ERC1155/ERC1155.sol b/contracts/token/ERC1155/ERC1155.sol
index 571c0214b81..47cc301dd5a 100644
--- a/contracts/token/ERC1155/ERC1155.sol
+++ b/contracts/token/ERC1155/ERC1155.sol
@@ -99,7 +99,7 @@ contract ERC1155 is ERC165, IERC1155
      * @param operator address to set the approval
      * @param approved representing the status of the approval to be set
      */
-    function setApprovalForAll(address operator, bool approved) external override virtual {
+    function setApprovalForAll(address operator, bool approved) public virtual override {
         require(msg.sender != operator, "ERC1155: cannot set approval status for self");
         _operatorApprovals[msg.sender][operator] = approved;
         emit ApprovalForAll(msg.sender, operator, approved);
@@ -130,11 +130,11 @@ contract ERC1155 is ERC165, IERC1155
         address to,
         uint256 id,
         uint256 value,
-        bytes calldata data
+        bytes memory data
     )
-        external
-        override
+        public
         virtual
+        override
     {
         require(to != address(0), "ERC1155: target address must be non-zero");
         require(
@@ -164,13 +164,13 @@ contract ERC1155 is ERC165, IERC1155
     function safeBatchTransferFrom(
         address from,
         address to,
-        uint256[] calldata ids,
-        uint256[] calldata values,
-        bytes calldata data
+        uint256[] memory ids,
+        uint256[] memory values,
+        bytes memory data
     )
-        external
-        override
+        public
         virtual
+        override
     {
         require(ids.length == values.length, "ERC1155: IDs and values must have same lengths");
         require(to != address(0), "ERC1155: target address must be non-zero");
@@ -275,8 +275,7 @@ contract ERC1155 is ERC165, IERC1155
         uint256 value,
         bytes memory data
     )
-        internal
-        virtual
+        private
     {
         if(to.isContract()) {
             require(
@@ -295,8 +294,7 @@ contract ERC1155 is ERC165, IERC1155
         uint256[] memory values,
         bytes memory data
     )
-        internal
-        virtual
+        private
     {
         if(to.isContract()) {
             require(