Skip to content

Commit 3fda63c

Browse files
author
David Rugendyke
committed
Updated code formatting
1 parent bc4353b commit 3fda63c

1 file changed

Lines changed: 22 additions & 23 deletions

File tree

contracts/RocketPoolMini.sol

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import "./contract/Owned.sol";
1212

1313
contract RocketPoolMini is Owned {
1414

15-
/**** Properties ***********/
15+
/**** Properties ***********/
1616

1717
// Hub address
1818
address private rocketHubAddress;
@@ -136,7 +136,7 @@ contract RocketPoolMini is Owned {
136136
RocketSettingsInterface rocketSettings = RocketSettingsInterface(rocketHub.getRocketSettingsAddress());
137137
status = rocketSettings.getPoolDefaultStatus();
138138
statusChangeTime = 0;
139-
}
139+
}
140140

141141
/// @dev Fallback function where our deposit + rewards will be received after requesting withdrawal from Casper
142142
function() public payable {
@@ -157,32 +157,32 @@ contract RocketPoolMini is Owned {
157157
/// @dev Returns the status of this pool
158158
function getStatus() public constant returns(uint) {
159159
return status;
160-
}
160+
}
161161

162162
/// @dev Returns the time the status last changed to its current status
163163
function getStatusChangeTime() public constant returns(uint256) {
164164
return statusChangeTime;
165-
}
165+
}
166166

167167
/// @dev Gets the current Ether amount sent for staking
168168
function getStakingBalance() public constant returns(uint256) {
169169
return stakingBalance;
170-
}
170+
}
171171

172172
/// @dev Gets the current Ether amount sent for staking
173173
function getStakingBalanceReceived() public constant returns(uint256) {
174174
return stakingBalanceReceived;
175-
}
175+
}
176176

177177
/// @dev Gets the current staking duration
178178
function getStakingDuration() public constant returns(uint256) {
179179
return stakingDuration;
180-
}
180+
}
181181

182182
/// @dev Gets the node address this mini pool is attached too
183183
function getNodeAddress() public constant returns(address) {
184184
return rocketNodeAddress;
185-
}
185+
}
186186

187187
/// @dev Returns true if this pool is able to send a deposit to Casper
188188
function getStakingDepositTimeMet() public constant returns(bool) {
@@ -192,15 +192,15 @@ contract RocketPoolMini is Owned {
192192
return true;
193193
}
194194
return false;
195-
}
195+
}
196196

197197
/// @dev Returns true if this pool is able to request withdrawal from Casper
198198
function getStakingRequestWithdrawalTimeMet() public constant returns(bool) {
199199
if(now >= (statusChangeTime + stakingDuration)) {
200200
return true;
201201
}
202202
return false;
203-
}
203+
}
204204

205205
/// @dev Returns true if this pool is able to withdraw its deposit + rewards from Casper
206206
function getStakingWithdrawalTimeMet() public constant returns(bool) {
@@ -212,20 +212,20 @@ contract RocketPoolMini is Owned {
212212
return true;
213213
}
214214
return false;
215-
}
215+
}
216216

217217

218218
/// @dev Set the node address this mini pool is attached too
219219
function setNodeDetails(address nodeAddress, bytes32 nodeValidationCode, bytes32 nodeRandao) public onlyLatestRocketPool {
220220
rocketNodeAddress = nodeAddress;
221221
rocketNodeValidationCode = nodeValidationCode;
222222
rocketNodeRandao = nodeRandao;
223-
}
223+
}
224224

225225
/// @dev Gets the current staking duration
226226
function setStakingDuration(uint256 newStakingDuration) public onlyLatestRocketPool {
227227
stakingDuration = newStakingDuration;
228-
}
228+
}
229229

230230

231231

@@ -235,36 +235,35 @@ contract RocketPoolMini is Owned {
235235
/// @dev Returns the user count for this pool
236236
function getUserCount() public constant returns(uint256) {
237237
return userAddresses.length;
238-
}
238+
}
239239

240240
/// @dev Returns the true if the user is in this pool
241241
function getUserExists(address userAddress) public constant returns(bool) {
242242
return users[userAddress].exists;
243-
}
243+
}
244244

245245
/// @dev Returns the true if the user has a deposit in this mini pool
246246
function getUserHasDeposit(address userAddress) public constant returns(bool) {
247247
return users[userAddress].exists && users[userAddress].balance > 0 ? true : false;
248-
}
248+
}
249249

250250
/// @dev Returns the amount of the users deposit
251251
function getUserDeposit(address userAddress) public constant isPoolUser(userAddress) returns(uint256) {
252252
return users[userAddress].balance;
253-
}
253+
}
254254

255255
/// @dev Returns the main user properties
256256
function getUser(address userAddress) public constant isPoolUser(userAddress) returns(address, uint256, uint256) {
257257
return (users[userAddress].partnerAddress,
258258
users[userAddress].balance,
259259
users[userAddress].created
260260
);
261-
}
261+
}
262262

263263
/// @dev Returns the users partner address
264264
function getUserPartner(address userAddress) public constant isPoolUser(userAddress) returns(address) {
265265
return users[userAddress].partnerAddress;
266-
}
267-
266+
}
268267

269268
/// @dev Rocket Pool updating the users balance, rewards earned and fees occured after staking and rewards are included
270269
function setUserBalanceRewardsFees(address userAddress, uint256 updatedBalance, int256 updatedRewards, uint256 updatedFees) public constant isPoolUser(userAddress) onlyLatestRocketPool returns(bool) {
@@ -275,7 +274,7 @@ contract RocketPoolMini is Owned {
275274
return true;
276275
}
277276
return false;
278-
}
277+
}
279278

280279

281280
/// @dev Register a new user, only the latest version of the parent pool contract can do this
@@ -307,7 +306,7 @@ contract RocketPoolMini is Owned {
307306
}
308307
}
309308
throw;
310-
}
309+
}
311310

312311

313312
/// @dev Removes a user from the pool
@@ -404,7 +403,7 @@ contract RocketPoolMini is Owned {
404403
}
405404

406405

407-
/// @dev Sets the status of the pool based on several parameters
406+
/// @dev Sets the status of the pool based on several parameters
408407
function updateStatus() public returns(bool) {
409408
// Get the settings to determine the status
410409
RocketHub rocketHub = RocketHub(rocketHubAddress);

0 commit comments

Comments
 (0)