Skip to content

Commit

Permalink
fix: solium errors - whitespace related
Browse files Browse the repository at this point in the history
  • Loading branch information
shrugs committed Jan 15, 2018
1 parent bd2f177 commit 3b48a67
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 9 deletions.
4 changes: 3 additions & 1 deletion .soliumrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
4 changes: 3 additions & 1 deletion contracts/MerkleProof.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion contracts/lifecycle/TokenDestructible.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/ERC23TokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/ForceEther.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pragma solidity ^0.4.18;
// if the contract is not payable.
// @notice To use, construct the contract with the target as argument.
// @author Remco Bloemen <remco@neufund.org>
contract ForceEther {
contract ForceEther {

function ForceEther() public payable { }

Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/InsecureTargetBounty.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions contracts/mocks/ReentrancyMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ contract ReentrancyMock is ReentrancyGuard {
}

function countLocalRecursive(uint256 n) public nonReentrant {
if(n > 0) {
if (n > 0) {
count();
countLocalRecursive(n - 1);
}
}

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);
Expand Down
2 changes: 1 addition & 1 deletion contracts/ownership/Contactable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 3b48a67

Please sign in to comment.