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
a6889776
Commit
a6889776
authored
Sep 28, 2018
by
Nicolás Venturo
Committed by
Leo Arias
Sep 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dangling commas are now required. (#1359)
parent
1a4e5346
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
26 additions
and
26 deletions
+26
-26
.eslintrc
.eslintrc
+1
-1
AllowanceCrowdsale.test.js
test/crowdsale/AllowanceCrowdsale.test.js
+1
-1
Crowdsale.test.js
test/crowdsale/Crowdsale.test.js
+2
-2
MintedCrowdsale.behavior.js
test/crowdsale/MintedCrowdsale.behavior.js
+1
-1
Escrow.behavior.js
test/payment/Escrow.behavior.js
+2
-2
ERC20.test.js
test/token/ERC20/ERC20.test.js
+7
-7
ERC20Burnable.behavior.js
test/token/ERC20/behaviors/ERC20Burnable.behavior.js
+2
-2
ERC20Mintable.behavior.js
test/token/ERC20/behaviors/ERC20Mintable.behavior.js
+1
-1
ERC721.behavior.js
test/token/ERC721/ERC721.behavior.js
+7
-7
ERC721MintBurn.behavior.js
test/token/ERC721/ERC721MintBurn.behavior.js
+2
-2
No files found.
.eslintrc
View file @
a6889776
...
...
@@ -25,7 +25,7 @@
// Code style
"camelcase": ["error", {"properties": "always"}],
"comma-dangle": ["
warn
", "always-multiline"],
"comma-dangle": ["
error
", "always-multiline"],
"comma-spacing": ["error", {"before": false, "after": true}],
"dot-notation": ["error", {"allowKeywords": true, "allowPattern": ""}],
"eol-last": ["error", "always"],
...
...
test/crowdsale/AllowanceCrowdsale.test.js
View file @
a6889776
...
...
@@ -46,7 +46,7 @@ contract('AllowanceCrowdsale', function ([_, investor, wallet, purchaser, tokenW
purchaser
:
investor
,
beneficiary
:
investor
,
value
:
value
,
amount
:
expectedTokenAmount
amount
:
expectedTokenAmount
,
});
});
...
...
test/crowdsale/Crowdsale.test.js
View file @
a6889776
...
...
@@ -87,7 +87,7 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) {
purchaser
:
investor
,
beneficiary
:
investor
,
value
:
value
,
amount
:
expectedTokenAmount
amount
:
expectedTokenAmount
,
});
});
...
...
@@ -111,7 +111,7 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) {
purchaser
:
purchaser
,
beneficiary
:
investor
,
value
:
value
,
amount
:
expectedTokenAmount
amount
:
expectedTokenAmount
,
});
});
...
...
test/crowdsale/MintedCrowdsale.behavior.js
View file @
a6889776
...
...
@@ -25,7 +25,7 @@ function shouldBehaveLikeMintedCrowdsale ([_, investor, wallet, purchaser], rate
purchaser
:
investor
,
beneficiary
:
investor
,
value
:
value
,
amount
:
expectedTokenAmount
amount
:
expectedTokenAmount
,
});
});
...
...
test/payment/Escrow.behavior.js
View file @
a6889776
...
...
@@ -34,7 +34,7 @@ function shouldBehaveLikeEscrow (primary, [payee1, payee2]) {
const
{
logs
}
=
await
this
.
escrow
.
deposit
(
payee1
,
{
from
:
primary
,
value
:
amount
});
expectEvent
.
inLogs
(
logs
,
'Deposited'
,
{
payee
:
payee1
,
weiAmount
:
amount
weiAmount
:
amount
,
});
});
...
...
@@ -87,7 +87,7 @@ function shouldBehaveLikeEscrow (primary, [payee1, payee2]) {
const
{
logs
}
=
await
this
.
escrow
.
withdraw
(
payee1
,
{
from
:
primary
});
expectEvent
.
inLogs
(
logs
,
'Withdrawn'
,
{
payee
:
payee1
,
weiAmount
:
amount
weiAmount
:
amount
,
});
});
});
...
...
test/token/ERC20/ERC20.test.js
View file @
a6889776
...
...
@@ -65,7 +65,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent
.
inLogs
(
logs
,
'Transfer'
,
{
from
:
owner
,
to
:
to
,
value
:
amount
value
:
amount
,
});
});
});
...
...
@@ -93,7 +93,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent
.
inLogs
(
logs
,
'Approval'
,
{
owner
:
owner
,
spender
:
spender
,
value
:
amount
value
:
amount
,
});
});
...
...
@@ -127,7 +127,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent
.
inLogs
(
logs
,
'Approval'
,
{
owner
:
owner
,
spender
:
spender
,
value
:
amount
value
:
amount
,
});
});
...
...
@@ -197,7 +197,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent
.
inLogs
(
logs
,
'Transfer'
,
{
from
:
owner
,
to
:
to
,
value
:
amount
value
:
amount
,
});
});
});
...
...
@@ -272,7 +272,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent
.
inLogs
(
logs
,
'Approval'
,
{
owner
:
owner
,
spender
:
spender
,
value
:
0
value
:
0
,
});
});
...
...
@@ -329,7 +329,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent
.
inLogs
(
logs
,
'Approval'
,
{
owner
:
owner
,
spender
:
spender
,
value
:
amount
value
:
amount
,
});
});
...
...
@@ -363,7 +363,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent
.
inLogs
(
logs
,
'Approval'
,
{
owner
:
owner
,
spender
:
spender
,
value
:
amount
value
:
amount
,
});
});
...
...
test/token/ERC20/behaviors/ERC20Burnable.behavior.js
View file @
a6889776
...
...
@@ -32,7 +32,7 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
expectEvent
.
inLogs
(
this
.
logs
,
'Transfer'
,
{
from
:
owner
,
to
:
ZERO_ADDRESS
,
value
:
amount
value
:
amount
,
});
});
}
...
...
@@ -78,7 +78,7 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
expectEvent
.
inLogs
(
this
.
logs
,
'Transfer'
,
{
from
:
owner
,
to
:
ZERO_ADDRESS
,
value
:
amount
value
:
amount
,
});
});
}
...
...
test/token/ERC20/behaviors/ERC20Mintable.behavior.js
View file @
a6889776
...
...
@@ -38,7 +38,7 @@ function shouldBehaveLikeERC20Mintable (minter, [anyone]) {
expectEvent
.
inLogs
(
this
.
logs
,
'Transfer'
,
{
from
:
ZERO_ADDRESS
,
to
:
anyone
,
value
:
amount
value
:
amount
,
});
});
}
...
...
test/token/ERC721/ERC721.behavior.js
View file @
a6889776
...
...
@@ -92,7 +92,7 @@ function shouldBehaveLikeERC721 (
expectEvent
.
inLogs
(
logs
,
'Transfer'
,
{
from
:
owner
,
to
:
this
.
toWhom
,
tokenId
:
tokenId
tokenId
:
tokenId
,
});
});
}
else
{
...
...
@@ -100,7 +100,7 @@ function shouldBehaveLikeERC721 (
expectEvent
.
inLogs
(
logs
,
'Transfer'
,
{
from
:
owner
,
to
:
this
.
toWhom
,
tokenId
:
tokenId
tokenId
:
tokenId
,
});
});
}
...
...
@@ -165,7 +165,7 @@ function shouldBehaveLikeERC721 (
expectEvent
.
inLogs
(
logs
,
'Transfer'
,
{
from
:
owner
,
to
:
owner
,
tokenId
:
tokenId
tokenId
:
tokenId
,
});
});
...
...
@@ -341,7 +341,7 @@ function shouldBehaveLikeERC721 (
expectEvent
.
inLogs
(
logs
,
'Approval'
,
{
owner
:
owner
,
approved
:
address
,
tokenId
:
tokenId
tokenId
:
tokenId
,
});
});
};
...
...
@@ -451,7 +451,7 @@ function shouldBehaveLikeERC721 (
expectEvent
.
inLogs
(
logs
,
'ApprovalForAll'
,
{
owner
:
owner
,
operator
:
operator
,
approved
:
true
approved
:
true
,
});
});
});
...
...
@@ -473,7 +473,7 @@ function shouldBehaveLikeERC721 (
expectEvent
.
inLogs
(
logs
,
'ApprovalForAll'
,
{
owner
:
owner
,
operator
:
operator
,
approved
:
true
approved
:
true
,
});
});
...
...
@@ -501,7 +501,7 @@ function shouldBehaveLikeERC721 (
expectEvent
.
inLogs
(
logs
,
'ApprovalForAll'
,
{
owner
:
owner
,
operator
:
operator
,
approved
:
true
approved
:
true
,
});
});
});
...
...
test/token/ERC721/ERC721MintBurn.behavior.js
View file @
a6889776
...
...
@@ -45,7 +45,7 @@ function shouldBehaveLikeMintAndBurnERC721 (
expectEvent
.
inLogs
(
logs
,
'Transfer'
,
{
from
:
ZERO_ADDRESS
,
to
:
newOwner
,
tokenId
:
thirdTokenId
tokenId
:
thirdTokenId
,
});
});
});
...
...
@@ -90,7 +90,7 @@ function shouldBehaveLikeMintAndBurnERC721 (
expectEvent
.
inLogs
(
logs
,
'Transfer'
,
{
from
:
owner
,
to
:
ZERO_ADDRESS
,
tokenId
:
tokenId
tokenId
:
tokenId
,
});
});
});
...
...
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