Commit a6889776 by Nicolás Venturo Committed by Leo Arias

Dangling commas are now required. (#1359)

parent 1a4e5346
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// Code style // Code style
"camelcase": ["error", {"properties": "always"}], "camelcase": ["error", {"properties": "always"}],
"comma-dangle": ["warn", "always-multiline"], "comma-dangle": ["error", "always-multiline"],
"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"],
......
...@@ -46,7 +46,7 @@ contract('AllowanceCrowdsale', function ([_, investor, wallet, purchaser, tokenW ...@@ -46,7 +46,7 @@ contract('AllowanceCrowdsale', function ([_, investor, wallet, purchaser, tokenW
purchaser: investor, purchaser: investor,
beneficiary: investor, beneficiary: investor,
value: value, value: value,
amount: expectedTokenAmount amount: expectedTokenAmount,
}); });
}); });
......
...@@ -87,7 +87,7 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) { ...@@ -87,7 +87,7 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) {
purchaser: investor, purchaser: investor,
beneficiary: investor, beneficiary: investor,
value: value, value: value,
amount: expectedTokenAmount amount: expectedTokenAmount,
}); });
}); });
...@@ -111,7 +111,7 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) { ...@@ -111,7 +111,7 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) {
purchaser: purchaser, purchaser: purchaser,
beneficiary: investor, beneficiary: investor,
value: value, value: value,
amount: expectedTokenAmount amount: expectedTokenAmount,
}); });
}); });
......
...@@ -25,7 +25,7 @@ function shouldBehaveLikeMintedCrowdsale ([_, investor, wallet, purchaser], rate ...@@ -25,7 +25,7 @@ function shouldBehaveLikeMintedCrowdsale ([_, investor, wallet, purchaser], rate
purchaser: investor, purchaser: investor,
beneficiary: investor, beneficiary: investor,
value: value, value: value,
amount: expectedTokenAmount amount: expectedTokenAmount,
}); });
}); });
......
...@@ -34,7 +34,7 @@ function shouldBehaveLikeEscrow (primary, [payee1, payee2]) { ...@@ -34,7 +34,7 @@ function shouldBehaveLikeEscrow (primary, [payee1, payee2]) {
const { logs } = await this.escrow.deposit(payee1, { from: primary, value: amount }); const { logs } = await this.escrow.deposit(payee1, { from: primary, value: amount });
expectEvent.inLogs(logs, 'Deposited', { expectEvent.inLogs(logs, 'Deposited', {
payee: payee1, payee: payee1,
weiAmount: amount weiAmount: amount,
}); });
}); });
...@@ -87,7 +87,7 @@ function shouldBehaveLikeEscrow (primary, [payee1, payee2]) { ...@@ -87,7 +87,7 @@ function shouldBehaveLikeEscrow (primary, [payee1, payee2]) {
const { logs } = await this.escrow.withdraw(payee1, { from: primary }); const { logs } = await this.escrow.withdraw(payee1, { from: primary });
expectEvent.inLogs(logs, 'Withdrawn', { expectEvent.inLogs(logs, 'Withdrawn', {
payee: payee1, payee: payee1,
weiAmount: amount weiAmount: amount,
}); });
}); });
}); });
......
...@@ -65,7 +65,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) { ...@@ -65,7 +65,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent.inLogs(logs, 'Transfer', { expectEvent.inLogs(logs, 'Transfer', {
from: owner, from: owner,
to: to, to: to,
value: amount value: amount,
}); });
}); });
}); });
...@@ -93,7 +93,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) { ...@@ -93,7 +93,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent.inLogs(logs, 'Approval', { expectEvent.inLogs(logs, 'Approval', {
owner: owner, owner: owner,
spender: spender, spender: spender,
value: amount value: amount,
}); });
}); });
...@@ -127,7 +127,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) { ...@@ -127,7 +127,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent.inLogs(logs, 'Approval', { expectEvent.inLogs(logs, 'Approval', {
owner: owner, owner: owner,
spender: spender, spender: spender,
value: amount value: amount,
}); });
}); });
...@@ -197,7 +197,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) { ...@@ -197,7 +197,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent.inLogs(logs, 'Transfer', { expectEvent.inLogs(logs, 'Transfer', {
from: owner, from: owner,
to: to, to: to,
value: amount value: amount,
}); });
}); });
}); });
...@@ -272,7 +272,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) { ...@@ -272,7 +272,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent.inLogs(logs, 'Approval', { expectEvent.inLogs(logs, 'Approval', {
owner: owner, owner: owner,
spender: spender, spender: spender,
value: 0 value: 0,
}); });
}); });
...@@ -329,7 +329,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) { ...@@ -329,7 +329,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent.inLogs(logs, 'Approval', { expectEvent.inLogs(logs, 'Approval', {
owner: owner, owner: owner,
spender: spender, spender: spender,
value: amount value: amount,
}); });
}); });
...@@ -363,7 +363,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) { ...@@ -363,7 +363,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
expectEvent.inLogs(logs, 'Approval', { expectEvent.inLogs(logs, 'Approval', {
owner: owner, owner: owner,
spender: spender, spender: spender,
value: amount value: amount,
}); });
}); });
......
...@@ -32,7 +32,7 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) { ...@@ -32,7 +32,7 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
expectEvent.inLogs(this.logs, 'Transfer', { expectEvent.inLogs(this.logs, 'Transfer', {
from: owner, from: owner,
to: ZERO_ADDRESS, to: ZERO_ADDRESS,
value: amount value: amount,
}); });
}); });
} }
...@@ -78,7 +78,7 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) { ...@@ -78,7 +78,7 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
expectEvent.inLogs(this.logs, 'Transfer', { expectEvent.inLogs(this.logs, 'Transfer', {
from: owner, from: owner,
to: ZERO_ADDRESS, to: ZERO_ADDRESS,
value: amount value: amount,
}); });
}); });
} }
......
...@@ -38,7 +38,7 @@ function shouldBehaveLikeERC20Mintable (minter, [anyone]) { ...@@ -38,7 +38,7 @@ function shouldBehaveLikeERC20Mintable (minter, [anyone]) {
expectEvent.inLogs(this.logs, 'Transfer', { expectEvent.inLogs(this.logs, 'Transfer', {
from: ZERO_ADDRESS, from: ZERO_ADDRESS,
to: anyone, to: anyone,
value: amount value: amount,
}); });
}); });
} }
......
...@@ -92,7 +92,7 @@ function shouldBehaveLikeERC721 ( ...@@ -92,7 +92,7 @@ function shouldBehaveLikeERC721 (
expectEvent.inLogs(logs, 'Transfer', { expectEvent.inLogs(logs, 'Transfer', {
from: owner, from: owner,
to: this.toWhom, to: this.toWhom,
tokenId: tokenId tokenId: tokenId,
}); });
}); });
} else { } else {
...@@ -100,7 +100,7 @@ function shouldBehaveLikeERC721 ( ...@@ -100,7 +100,7 @@ function shouldBehaveLikeERC721 (
expectEvent.inLogs(logs, 'Transfer', { expectEvent.inLogs(logs, 'Transfer', {
from: owner, from: owner,
to: this.toWhom, to: this.toWhom,
tokenId: tokenId tokenId: tokenId,
}); });
}); });
} }
...@@ -165,7 +165,7 @@ function shouldBehaveLikeERC721 ( ...@@ -165,7 +165,7 @@ function shouldBehaveLikeERC721 (
expectEvent.inLogs(logs, 'Transfer', { expectEvent.inLogs(logs, 'Transfer', {
from: owner, from: owner,
to: owner, to: owner,
tokenId: tokenId tokenId: tokenId,
}); });
}); });
...@@ -341,7 +341,7 @@ function shouldBehaveLikeERC721 ( ...@@ -341,7 +341,7 @@ function shouldBehaveLikeERC721 (
expectEvent.inLogs(logs, 'Approval', { expectEvent.inLogs(logs, 'Approval', {
owner: owner, owner: owner,
approved: address, approved: address,
tokenId: tokenId tokenId: tokenId,
}); });
}); });
}; };
...@@ -451,7 +451,7 @@ function shouldBehaveLikeERC721 ( ...@@ -451,7 +451,7 @@ function shouldBehaveLikeERC721 (
expectEvent.inLogs(logs, 'ApprovalForAll', { expectEvent.inLogs(logs, 'ApprovalForAll', {
owner: owner, owner: owner,
operator: operator, operator: operator,
approved: true approved: true,
}); });
}); });
}); });
...@@ -473,7 +473,7 @@ function shouldBehaveLikeERC721 ( ...@@ -473,7 +473,7 @@ function shouldBehaveLikeERC721 (
expectEvent.inLogs(logs, 'ApprovalForAll', { expectEvent.inLogs(logs, 'ApprovalForAll', {
owner: owner, owner: owner,
operator: operator, operator: operator,
approved: true approved: true,
}); });
}); });
...@@ -501,7 +501,7 @@ function shouldBehaveLikeERC721 ( ...@@ -501,7 +501,7 @@ function shouldBehaveLikeERC721 (
expectEvent.inLogs(logs, 'ApprovalForAll', { expectEvent.inLogs(logs, 'ApprovalForAll', {
owner: owner, owner: owner,
operator: operator, operator: operator,
approved: true approved: true,
}); });
}); });
}); });
......
...@@ -45,7 +45,7 @@ function shouldBehaveLikeMintAndBurnERC721 ( ...@@ -45,7 +45,7 @@ function shouldBehaveLikeMintAndBurnERC721 (
expectEvent.inLogs(logs, 'Transfer', { expectEvent.inLogs(logs, 'Transfer', {
from: ZERO_ADDRESS, from: ZERO_ADDRESS,
to: newOwner, to: newOwner,
tokenId: thirdTokenId tokenId: thirdTokenId,
}); });
}); });
}); });
...@@ -90,7 +90,7 @@ function shouldBehaveLikeMintAndBurnERC721 ( ...@@ -90,7 +90,7 @@ function shouldBehaveLikeMintAndBurnERC721 (
expectEvent.inLogs(logs, 'Transfer', { expectEvent.inLogs(logs, 'Transfer', {
from: owner, from: owner,
to: ZERO_ADDRESS, to: ZERO_ADDRESS,
tokenId: tokenId tokenId: tokenId,
}); });
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment