crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename remaining inconsistencies

Browse Source
This commit is contained in:
Amir Bandeali
2019-05-08 20:23:45 -07:00
parent 0cfcb6aa37
commit 8bd29596c4
11 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/erc1155/contracts/src/ERC1155.sol
View File

@@ -19,7 +19,7 @@
pragma solidity ^0.5.5;
import "@0x/contracts-utils/contracts/src/SafeMath.sol";
import "@0x/contracts-utils/contracts/src/Address.sol";
import "@0x/contracts-utils/contracts/src/LibAddress.sol";
import "./interfaces/IERC1155.sol";
import "./interfaces/IERC1155Receiver.sol";
import "./MixinNonFungibleToken.sol";
@@ -30,7 +30,7 @@ contract ERC1155 is
IERC1155,
MixinNonFungibleToken
{
using Address for address;
using LibAddress for address;
// selectors for receiver callbacks
bytes4 constant public ERC1155_RECEIVED = 0xf23a6e61;
@@ -97,7 +97,7 @@ contract ERC1155 is
emit TransferSingle(msg.sender, from, to, id, value);
// if `to` is a contract then trigger its callback
if (to._isContract()) {
if (to.isContract()) {
bytes4 callbackReturnValue = IERC1155Receiver(to).onERC1155Received(
msg.sender,
from,
@@ -177,7 +177,7 @@ contract ERC1155 is
emit TransferBatch(msg.sender, from, to, ids, values);
// if `to` is a contract then trigger its callback
if (to._isContract()) {
if (to.isContract()) {
bytes4 callbackReturnValue = IERC1155Receiver(to).onERC1155BatchReceived(
msg.sender,
from,

4
contracts/erc1155/contracts/src/ERC1155Mintable.sol
View File

@@ -128,7 +128,7 @@ contract ERC1155Mintable is
);
// if `to` is a contract then trigger its callback
if (dst._isContract()) {
if (dst.isContract()) {
bytes4 callbackReturnValue = IERC1155Receiver(dst).onERC1155Received(
msg.sender,
msg.sender,
@@ -177,7 +177,7 @@ contract ERC1155Mintable is
emit TransferSingle(msg.sender, address(0x0), dst, id, 1);
// if `to` is a contract then trigger its callback
if (dst._isContract()) {
if (dst.isContract()) {
bytes4 callbackReturnValue = IERC1155Receiver(dst).onERC1155Received(
msg.sender,
msg.sender,