Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
196c7620
Commit
196c7620
authored
Sep 18, 2020
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linter
parent
666ba11c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
.eslintrc
.eslintrc
+1
-1
ERC1155.sol
contracts/token/ERC1155/ERC1155.sol
+5
-1
No files found.
.eslintrc
View file @
196c7620
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
// Code style
// Code style
"array-bracket-spacing": ["off"],
"array-bracket-spacing": ["off"],
"camelcase": ["error", {"properties": "always"}],
"camelcase": ["error", {"properties": "always"}],
"comma-dangle": ["
error", "always-multiline
"],
"comma-dangle": ["
off
"],
"comma-spacing": ["error", {"before": false, "after": true}],
"comma-spacing": ["error", {"before": false, "after": true}],
"dot-notation": ["error", {"allowKeywords": true, "allowPattern": ""}],
"dot-notation": ["error", {"allowKeywords": true, "allowPattern": ""}],
"eol-last": ["error", "always"],
"eol-last": ["error", "always"],
...
...
contracts/token/ERC1155/ERC1155.sol
View file @
196c7620
...
@@ -355,7 +355,9 @@ contract ERC1155 is Initializable, Context, ERC165, IERC1155, IERC1155MetadataUR
...
@@ -355,7 +355,9 @@ contract ERC1155 is Initializable, Context, ERC165, IERC1155, IERC1155MetadataUR
bytes memory data
bytes memory data
)
)
internal
internal
{ }
{
// solhint-disable-previous-line no-empty-blocks
}
function _doSafeTransferAcceptanceCheck(
function _doSafeTransferAcceptanceCheck(
address operator,
address operator,
...
@@ -368,6 +370,7 @@ contract ERC1155 is Initializable, Context, ERC165, IERC1155, IERC1155MetadataUR
...
@@ -368,6 +370,7 @@ contract ERC1155 is Initializable, Context, ERC165, IERC1155, IERC1155MetadataUR
private
private
{
{
if (to.isContract()) {
if (to.isContract()) {
// solhint-disable-next-line avoid-low-level-calls
(bool success, bytes memory returndata) = to.call(abi.encodeWithSelector(
(bool success, bytes memory returndata) = to.call(abi.encodeWithSelector(
IERC1155Receiver(to).onERC1155Received.selector,
IERC1155Receiver(to).onERC1155Received.selector,
operator,
operator,
...
@@ -406,6 +409,7 @@ contract ERC1155 is Initializable, Context, ERC165, IERC1155, IERC1155MetadataUR
...
@@ -406,6 +409,7 @@ contract ERC1155 is Initializable, Context, ERC165, IERC1155, IERC1155MetadataUR
private
private
{
{
if (to.isContract()) {
if (to.isContract()) {
// solhint-disable-next-line avoid-low-level-calls
(bool success, bytes memory returndata) = to.call(abi.encodeWithSelector(
(bool success, bytes memory returndata) = to.call(abi.encodeWithSelector(
IERC1155Receiver(to).onERC1155BatchReceived.selector,
IERC1155Receiver(to).onERC1155BatchReceived.selector,
operator,
operator,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment