Skip to content

Commit 6d8bb49

Browse files
committed
removing trailing whitespace
1 parent 1737555 commit 6d8bb49

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+125
-125
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ build/
66
/coverage
77
coverage.json
88
allFiredEvents
9-
scTopics
9+
scTopics

.solcover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module.exports = {
22
norpc: true,
33
testCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle test --network coverage',
44
skipFiles: ['lifecycle/Migrations.sol']
5-
}
5+
}

.soliumignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
node_modules
1+
node_modules

LICENSE

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ Copyright (c) 2016 Smart Contract Solutions, Inc.
55
Permission is hereby granted, free of charge, to any person obtaining
66
a copy of this software and associated documentation files (the
77
"Software"), to deal in the Software without restriction, including
8-
without limitation the rights to use, copy, modify, merge, publish,
8+
without limitation the rights to use, copy, modify, merge, publish,
99
distribute, sublicense, and/or sell copies of the Software, and to
10-
permit persons to whom the Software is furnished to do so, subject to
10+
permit persons to whom the Software is furnished to do so, subject to
1111
the following conditions:
1212

1313
The above copyright notice and this permission notice shall be included
1414
in all copies or substantial portions of the Software.
1515

16-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
17-
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
17+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
2222
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

audit/ZeppelinAudit.md

Lines changed: 32 additions & 32 deletions
Large diffs are not rendered by default.

contracts/crowdsale/Crowdsale.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import '../token/MintableToken.sol';
44
import '../math/SafeMath.sol';
55

66
/**
7-
* @title Crowdsale
7+
* @title Crowdsale
88
* @dev Crowdsale is a base contract for managing a token crowdsale.
99
* Crowdsales have a start and end timestamps, where investors can make
1010
* token purchases and the crowdsale will assign them tokens based
11-
* on a token per ETH rate. Funds collected are forwarded to a wallet
11+
* on a token per ETH rate. Funds collected are forwarded to a wallet
1212
* as they arrive.
1313
*/
1414
contract Crowdsale {
@@ -36,7 +36,7 @@ contract Crowdsale {
3636
* @param beneficiary who got the tokens
3737
* @param value weis paid for purchase
3838
* @param amount amount of tokens purchased
39-
*/
39+
*/
4040
event TokenPurchase(address indexed purchaser, address indexed beneficiary, uint256 value, uint256 amount);
4141

4242

@@ -53,7 +53,7 @@ contract Crowdsale {
5353
wallet = _wallet;
5454
}
5555

56-
// creates the token to be sold.
56+
// creates the token to be sold.
5757
// override this method to have crowdsale of a specific mintable token.
5858
function createTokenContract() internal returns (MintableToken) {
5959
return new MintableToken();

contracts/crowdsale/FinalizableCrowdsale.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import './Crowdsale.sol';
77
/**
88
* @title FinalizableCrowdsale
99
* @dev Extension of Crowsdale where an owner can do extra work
10-
* after finishing.
10+
* after finishing.
1111
*/
1212
contract FinalizableCrowdsale is Crowdsale, Ownable {
1313
using SafeMath for uint256;
@@ -26,7 +26,7 @@ contract FinalizableCrowdsale is Crowdsale, Ownable {
2626

2727
finalization();
2828
Finalized();
29-
29+
3030
isFinalized = true;
3131
}
3232

contracts/examples/SampleCrowdsale.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale {
4545
return new SampleCrowdsaleToken();
4646
}
4747

48-
}
48+
}

contracts/lifecycle/Destructible.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import "../ownership/Ownable.sol";
1010
*/
1111
contract Destructible is Ownable {
1212

13-
function Destructible() payable { }
13+
function Destructible() payable { }
1414

1515
/**
16-
* @dev Transfers the current balance to the owner and terminates the contract.
16+
* @dev Transfers the current balance to the owner and terminates the contract.
1717
*/
1818
function destroy() onlyOwner {
1919
selfdestruct(owner);

contracts/lifecycle/TokenDestructible.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ pragma solidity ^0.4.11;
44
import "../ownership/Ownable.sol";
55
import "../token/ERC20Basic.sol";
66

7-
/**
7+
/**
88
* @title TokenDestructible:
99
* @author Remco Bloemen <remco@2π.com>
1010
* @dev Base contract that can be destroyed by owner. All funds in contract including
1111
* listed tokens will be sent to the owner.
1212
*/
1313
contract TokenDestructible is Ownable {
1414

15-
function TokenDestructible() payable { }
15+
function TokenDestructible() payable { }
1616

17-
/**
17+
/**
1818
* @notice Terminate contract and refund to owner
1919
* @param tokens List of addresses of ERC20 or ERC20Basic token contracts to
2020
refund.

contracts/ownership/Contactable.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import './Ownable.sol';
44

55
/**
66
* @title Contactable token
7-
* @dev Basic version of a contactable contract, allowing the owner to provide a string with their
7+
* @dev Basic version of a contactable contract, allowing the owner to provide a string with their
88
* contact information.
99
*/
1010
contract Contactable is Ownable{

contracts/ownership/HasNoContracts.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pragma solidity ^0.4.11;
22

33
import "./Ownable.sol";
44

5-
/**
5+
/**
66
* @title Contracts that should not own Contracts
77
* @author Remco Bloemen <remco@2π.com>
88
* @dev Should contracts (anything Ownable) end up being owned by this contract, it allows the owner

contracts/ownership/NoOwner.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import "./HasNoEther.sol";
44
import "./HasNoTokens.sol";
55
import "./HasNoContracts.sol";
66

7-
/**
7+
/**
88
* @title Base contract for contracts that should not own things.
99
* @author Remco Bloemen <remco@2π.com>
10-
* @dev Solves a class of errors where a contract accidentally becomes owner of Ether, Tokens or
10+
* @dev Solves a class of errors where a contract accidentally becomes owner of Ether, Tokens or
1111
* Owned contracts. See respective base contracts for details.
1212
*/
1313
contract NoOwner is HasNoEther, HasNoTokens, HasNoContracts {

contracts/ownership/Ownable.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ contract Ownable {
3636
* @param newOwner The address to transfer ownership to.
3737
*/
3838
function transferOwnership(address newOwner) onlyOwner {
39-
require(newOwner != address(0));
39+
require(newOwner != address(0));
4040
OwnershipTransferred(owner, newOwner);
4141
owner = newOwner;
4242
}

contracts/token/BasicToken.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import '../math/SafeMath.sol';
77

88
/**
99
* @title Basic token
10-
* @dev Basic version of StandardToken, with no allowances.
10+
* @dev Basic version of StandardToken, with no allowances.
1111
*/
1212
contract BasicToken is ERC20Basic {
1313
using SafeMath for uint256;
@@ -31,7 +31,7 @@ contract BasicToken is ERC20Basic {
3131

3232
/**
3333
* @dev Gets the balance of the specified address.
34-
* @param _owner The address to query the the balance of.
34+
* @param _owner The address to query the the balance of.
3535
* @return An uint256 representing the amount owned by the passed address.
3636
*/
3737
function balanceOf(address _owner) constant returns (uint256 balance) {

contracts/token/StandardToken.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,21 @@ contract StandardToken is ERC20, BasicToken {
6565
function allowance(address _owner, address _spender) constant returns (uint256 remaining) {
6666
return allowed[_owner][_spender];
6767
}
68-
68+
6969
/**
7070
* approve should be called when allowed[_spender] == 0. To increment
71-
* allowed value is better to use this function to avoid 2 calls (and wait until
71+
* allowed value is better to use this function to avoid 2 calls (and wait until
7272
* the first transaction is mined)
7373
* From MonolithDAO Token.sol
7474
*/
75-
function increaseApproval (address _spender, uint _addedValue)
75+
function increaseApproval (address _spender, uint _addedValue)
7676
returns (bool success) {
7777
allowed[msg.sender][_spender] = allowed[msg.sender][_spender].add(_addedValue);
7878
Approval(msg.sender, _spender, allowed[msg.sender][_spender]);
7979
return true;
8080
}
8181

82-
function decreaseApproval (address _spender, uint _subtractedValue)
82+
function decreaseApproval (address _spender, uint _subtractedValue)
8383
returns (bool success) {
8484
uint oldValue = allowed[msg.sender][_spender];
8585
if (_subtractedValue > oldValue) {

docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ help:
1717
# Catch-all target: route all unknown targets to Sphinx using the new
1818
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1919
%: Makefile
20-
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
20+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/source/basictoken.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Returns the token balance of the passed address.
99

1010
function transfer(address _to, uint _value) returns (bool success)
1111
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
12-
Transfers tokens from sender's account. Amount must not be greater than sender's balance.
12+
Transfers tokens from sender's account. Amount must not be greater than sender's balance.

docs/source/developer-resources.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Interested in contributing to Zeppelin?
99

1010
* Framework proposal and roadmap: https://medium.com/zeppelin-blog/zeppelin-framework-proposal-and-development-roadmap-fdfa9a3a32ab#.iain47pak
1111
* Issue tracker: https://github.com/OpenZeppelin/zeppelin-solidity/issues
12-
* Contribution guidelines: https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/CONTRIBUTING.md
12+
* Contribution guidelines: https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/CONTRIBUTING.md

docs/source/index.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
Welcome to Zeppelin-Solidity
77
=============================================
88

9-
Zeppelin is a library for writing secure Smart Contracts on Ethereum.
9+
Zeppelin is a library for writing secure Smart Contracts on Ethereum.
1010

1111
With Zeppelin, you can build distributed applications, protocols and organizations:
1212

1313
* using :doc:`contract-security-patterns`
1414
* in the `Solidity language <https://solidity.readthedocs.io/en/develop/>`_.
1515

16-
The code is open-source, and `available on github <https://github.com/OpenZeppelin/zeppelin-solidity>`_.
16+
The code is open-source, and `available on github <https://github.com/OpenZeppelin/zeppelin-solidity>`_.
1717

1818
.. toctree::
1919
:maxdepth: 2
@@ -24,7 +24,7 @@ The code is open-source, and `available on github <https://github.com/OpenZeppel
2424
.. toctree::
2525
:maxdepth: 2
2626
:caption: Smart Contracts
27-
27+
2828
ownable
2929
Pausable
3030
destructible
@@ -41,7 +41,7 @@ The code is open-source, and `available on github <https://github.com/OpenZeppel
4141
.. toctree::
4242
:maxdepth: 2
4343
:caption: Developer Resources
44-
44+
4545
contract-security-patterns
4646
developer-resources
47-
license
47+
license

docs/source/killable.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ Destroys the contract and sends funds back to the owner.
1313
destroyAndSend(address _recipient) onlyOwner
1414
"""""""""""""""""""
1515

16-
Destroys the contract and sends funds back to the _recepient.
16+
Destroys the contract and sends funds back to the _recepient.

docs/source/license.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ Copyright (c) 2016 Smart Contract Solutions, Inc.
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
88
"Software"), to deal in the Software without restriction, including
9-
without limitation the rights to use, copy, modify, merge, publish,
9+
without limitation the rights to use, copy, modify, merge, publish,
1010
distribute, sublicense, and/or sell copies of the Software, and to
11-
permit persons to whom the Software is furnished to do so, subject to
11+
permit persons to whom the Software is furnished to do so, subject to
1212
the following conditions:
1313

1414
The above copyright notice and this permission notice shall be included
1515
in all copies or substantial portions of the Software.
1616

17-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
18-
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
20-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
21-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
22-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
23-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
18+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
20+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
21+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
22+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
23+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

docs/source/migrations.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ Creates a new instance of the contract at the passed address.
1313
setCompleted(uint completed) onlyOwner**
1414
""""""""""""""""""""""""""""""""""""""""
1515

16-
Sets the last time that a migration was completed.
16+
Sets the last time that a migration was completed.

docs/source/pausable.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Only runs if pause mechanism is activated.
2424
unpause() onlyOwner whenPaused returns (bool)
2525
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
2626

27-
Deactivates the pause mechanism.
27+
Deactivates the pause mechanism.

docs/source/safemath.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ Checks that b is not greater than a before subtracting.
2121
add(uint256 a, uint256 b) internal returns (uint256)
2222
"""""""""""""""""""""""""""""""""""""""""""""""""
2323

24-
Checks that the result is greater than both a and b.
24+
Checks that the result is greater than both a and b.

docs/source/standardtoken.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ Transfers tokens from an account that the sender is approved to transfer from. A
2323

2424
function transfer(address _to, uint _value) returns (bool success)
2525
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
26-
Transfers tokens from sender's account. Amount must not be greater than sender's balance.
26+
Transfers tokens from sender's account. Amount must not be greater than sender's balance.

test/BasicToken.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ contract('BasicToken', function(accounts) {
2929
assert.fail('should have thrown before');
3030
} catch(error) {
3131
assertJump(error);
32-
}
32+
}
3333
});
3434

3535
it('should throw an error when trying to transfer to 0x0', async function() {

test/Bounty.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function awaitEvent(event, handler) {
1515
function wrappedHandler(...args) {
1616
Promise.resolve(handler(...args)).then(resolve).catch(reject);
1717
}
18-
18+
1919
event.watch(wrappedHandler);
2020
});
2121
}
@@ -90,7 +90,7 @@ contract('Bounty', function(accounts) {
9090
let reward = web3.toWei(1, 'ether');
9191
let bounty = await InsecureTargetBounty.new();
9292
let event = bounty.TargetCreated({});
93-
93+
9494
let watcher = async function(err, result) {
9595
event.stopWatching();
9696
if (err) { throw err; }

test/BurnableToken.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require('chai')
1212
const expect = require('chai').expect
1313

1414
contract('BurnableToken', function (accounts) {
15-
let token
15+
let token
1616
let expectedTokenSupply = new BigNumber(999)
1717

1818
beforeEach(async function () {
@@ -34,6 +34,6 @@ contract('BurnableToken', function (accounts) {
3434

3535
it('cannot burn more tokens than your balance', async function () {
3636
await token.burn(2000, { from: accounts[0] })
37-
.should.be.rejectedWith(EVMThrow)
37+
.should.be.rejectedWith(EVMThrow)
3838
})
39-
})
39+
})

0 commit comments

Comments
 (0)