Skip to content
This repository was archived by the owner on Jul 11, 2019. It is now read-only.

Commit 2b6bd98

Browse files
committed
apply the rules to all dirs
1 parent 04e499a commit 2b6bd98

File tree

9 files changed

+30
-26
lines changed

9 files changed

+30
-26
lines changed

.soliumignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
node_modules
2+
examples/simple/node_modules
3+
examples/complex/node_modules

contracts/mocks/MultipleInheritanceMigratableMocks.sol

+1-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ contract SampleChildV1 is Migratable, SampleMotherV1, SampleFatherV1 {
101101
* ChildV2 extends from motherV1, fatherV1 (grampsV1)
102102
*/
103103
contract SampleChildV2 is SampleChildV1 {
104-
function migrate(uint256 _child) isMigration("Child", "migration_1", "migration_2") public
105-
{
104+
function migrate(uint256 _child) isMigration("Child", "migration_1", "migration_2") public {
106105
child = _child;
107106
}
108107
}

examples/complex/contracts/DonationsV1.sol

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ pragma solidity ^0.4.21;
33
import "openzeppelin-zos/contracts/ownership/Ownable.sol";
44
import "openzeppelin-zos/contracts/math/SafeMath.sol";
55

6+
67
contract DonationsV1 is Ownable {
78
using SafeMath for uint256;
89

@@ -20,7 +21,7 @@ contract DonationsV1 is Ownable {
2021
return donorBalances[_donor];
2122
}
2223

23-
function withdraw(address _wallet) onlyOwner {
24+
function withdraw(address _wallet) public onlyOwner {
2425

2526
// Withdraw all donated funds.
2627
_wallet.transfer(this.balance);

examples/complex/contracts/DonationsV2.sol

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ pragma solidity ^0.4.21;
33
import "./DonationsV1.sol";
44
import "openzeppelin-zos/contracts/token/ERC721/MintableERC721Token.sol";
55

6+
67
contract DonationsV2 is DonationsV1 {
78
using SafeMath for uint256;
89

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
pragma solidity ^0.4.4;
22

3+
34
contract Migrations {
45
address public owner;
5-
uint public last_completed_migration;
6+
uint public lastCompletedMigration;
67

78
modifier restricted() {
8-
if (msg.sender == owner) _;
9+
if (msg.sender == owner)
10+
_;
911
}
1012

11-
function Migrations() {
13+
function Migrations() public {
1214
owner = msg.sender;
1315
}
1416

15-
function setCompleted(uint completed) restricted {
16-
last_completed_migration = completed;
17+
function setCompleted(uint completed) public restricted {
18+
lastCompletedMigration = completed;
1719
}
1820

19-
function upgrade(address new_address) restricted {
20-
Migrations upgraded = Migrations(new_address);
21-
upgraded.setCompleted(last_completed_migration);
21+
function upgrade(address newAddress) public restricted {
22+
Migrations upgraded = Migrations(newAddress);
23+
upgraded.setCompleted(lastCompletedMigration);
2224
}
2325
}

examples/simple/contracts/MyContract_v0.sol examples/simple/contracts/MyContractV0.sol

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ pragma solidity ^0.4.21;
44
import "zos-lib/contracts/migrations/Initializable.sol";
55

66

7-
contract MyContract_v0 is Initializable {
7+
contract MyContractV0 is Initializable {
88

99
uint256 public value;
10-
10+
1111
function initialize(uint256 _value) isInitializer public {
1212
value = _value;
1313
}
1414
}
15-

examples/simple/contracts/MyContract_v1.sol examples/simple/contracts/MyContractV1.sol

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ pragma solidity ^0.4.21;
44
import "zos-lib/contracts/migrations/Initializable.sol";
55

66

7-
contract MyContract_v1 is Initializable {
7+
contract MyContractV1 is Initializable {
88
uint256 public x;
9-
9+
1010
function initialize(uint256 _value) isInitializer public {
1111
value = _value;
1212
}
1313

14-
1514
function add(uint256 _value) public {
1615
value = value + _value;
1716
}
1817
}
19-

examples/simple/index.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
'use strict';
22

33
const { Contracts } = require('zos-lib')
4-
const MyContract_v0 = Contracts.getFromLocal('MyContract_v0');
5-
const MyContract_v1 = Contracts.getFromLocal('MyContract_v1');
4+
const MyContractV0 = Contracts.getFromLocal('MyContractV0');
5+
const MyContractV1 = Contracts.getFromLocal('MyContractV1');
66
const AdminUpgradeabilityProxy = Contracts.getFromNodeModules('zos-lib', 'AdminUpgradeabilityProxy');
77

88
module.exports = async function() {
99
console.log('Deploying MyContract v0...');
10-
const myContract_v0 = await MyContract_v0.new();
10+
const myContractV0 = await MyContractV0.new();
1111

1212
console.log('Deploying a proxy pointing to v0...');
13-
const proxy = await AdminUpgradeabilityProxy.new(myContract_v0.address);
13+
const proxy = await AdminUpgradeabilityProxy.new(myContractV0.address);
1414

1515
console.log('Calling initialize(42) on proxy...');
16-
let myContract = await MyContract_v0.at(proxy.address);
16+
let myContract = await MyContractV0.at(proxy.address);
1717
const value = 42;
1818
await myContract.initialize(value);
1919
console.log('Proxy\'s storage value: ' + (await myContract.value()).toString());
2020

2121
console.log('Deploying MyContract v1...');
22-
const myContract_v1 = await MyContract_v1.new();
22+
const myContractV1 = await MyContractV1.new();
2323

2424
console.log('Upgrading proxy to v1...');
25-
await proxy.upgradeTo(myContract_v1.address);
26-
myContract = await MyContract_v1.at(proxy.address);
25+
await proxy.upgradeTo(myContractV1.address);
26+
myContract = await MyContractV1.at(proxy.address);
2727

2828
await myContract.add(1);
2929
console.log('Proxy\'s storage new value: ' + (await myContract.value()).toString());

test/mocks/mock-dependency/contracts/Greeter.sol

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pragma solidity ^0.4.21;
22

3+
34
contract Greeter {
45
event Greeting(string greeting);
56

0 commit comments

Comments
 (0)