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
3b48a671
Commit
3b48a671
authored
Jan 15, 2018
by
Matt Condon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: solium errors - whitespace related
parent
bd2f1773
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
8 deletions
+12
-8
.soliumrc.json
.soliumrc.json
+3
-1
MerkleProof.sol
contracts/MerkleProof.sol
+3
-1
TokenDestructible.sol
contracts/lifecycle/TokenDestructible.sol
+1
-1
ERC23TokenMock.sol
contracts/mocks/ERC23TokenMock.sol
+1
-1
ForceEther.sol
contracts/mocks/ForceEther.sol
+0
-0
InsecureTargetBounty.sol
contracts/mocks/InsecureTargetBounty.sol
+1
-1
ReentrancyMock.sol
contracts/mocks/ReentrancyMock.sol
+2
-2
Contactable.sol
contracts/ownership/Contactable.sol
+1
-1
No files found.
.soliumrc.json
View file @
3b48a671
...
...
@@ -5,6 +5,8 @@
"quotes"
:
[
"error"
,
"double"
],
"indentation"
:
[
"error"
,
2
],
"arg-overflow"
:
[
"warning"
,
3
],
"security/enforce-explicit-visibility"
:
[
"error"
]
"security/enforce-explicit-visibility"
:
[
"error"
],
"security/no-block-members"
:
[
"warning"
],
"security/no-inline-assembly"
:
[
"warning"
]
}
}
contracts/MerkleProof.sol
View file @
3b48a671
...
...
@@ -16,7 +16,9 @@ library MerkleProof {
*/
function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) public pure returns (bool) {
// Check if proof length is a multiple of 32
if (_proof.length % 32 != 0) return false;
if (_proof.length % 32 != 0) {
return false;
}
bytes32 proofElement;
bytes32 computedHash = _leaf;
...
...
contracts/lifecycle/TokenDestructible.sol
View file @
3b48a671
...
...
@@ -24,7 +24,7 @@ contract TokenDestructible is Ownable {
function destroy(address[] tokens) onlyOwner public {
// Transfer tokens to owner
for(uint256 i = 0; i < tokens.length; i++) {
for
(uint256 i = 0; i < tokens.length; i++) {
ERC20Basic token = ERC20Basic(tokens[i]);
uint256 balance = token.balanceOf(this);
token.transfer(owner, balance);
...
...
contracts/mocks/ERC23TokenMock.sol
View file @
3b48a671
...
...
@@ -25,7 +25,7 @@ contract ERC23TokenMock is BasicToken {
assembly {
is_contract := not(iszero(extcodesize(_to)))
}
if(is_contract) {
if
(is_contract) {
ERC23ContractInterface receiver = ERC23ContractInterface(_to);
receiver.tokenFallback(msg.sender, _value, _data);
}
...
...
contracts/mocks/ForceEther.sol
View file @
3b48a671
contracts/mocks/InsecureTargetBounty.sol
View file @
3b48a671
...
...
@@ -4,7 +4,7 @@ import {Bounty, Target} from "../../contracts/Bounty.sol";
contract InsecureTargetMock is Target {
function checkInvariant() public returns(bool){
function checkInvariant() public returns(bool)
{
return false;
}
}
...
...
contracts/mocks/ReentrancyMock.sol
View file @
3b48a671
...
...
@@ -17,7 +17,7 @@ contract ReentrancyMock is ReentrancyGuard {
}
function countLocalRecursive(uint256 n) public nonReentrant {
if(n > 0) {
if
(n > 0) {
count();
countLocalRecursive(n - 1);
}
...
...
@@ -25,7 +25,7 @@ contract ReentrancyMock is ReentrancyGuard {
function countThisRecursive(uint256 n) public nonReentrant {
bytes4 func = bytes4(keccak256("countThisRecursive(uint256)"));
if(n > 0) {
if
(n > 0) {
count();
bool result = this.call(func, n - 1);
require(result == true);
...
...
contracts/ownership/Contactable.sol
View file @
3b48a671
...
...
@@ -8,7 +8,7 @@ import "./Ownable.sol";
* @dev Basic version of a contactable contract, allowing the owner to provide a string with their
* contact information.
*/
contract Contactable is Ownable{
contract Contactable is Ownable
{
string public contactInformation;
...
...
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