Skip to content

Commit 7e7879b

Browse files
committed
ensure! and rm stale comment.
1 parent b3694d5 commit 7e7879b

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

farm/contract/lib.rs

+3-10
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ mod farm {
263263
self.pool_id
264264
}
265265

266-
// wouldn't just "total_shares" be a better name, "total_supply" might suggest that farm has its own token?
267266
#[ink(message)]
268267
fn total_shares(&self) -> u128 {
269268
self.total_shares
@@ -286,13 +285,9 @@ mod farm {
286285
end: Timestamp,
287286
rewards: Vec<u128>,
288287
) -> Result<(), FarmError> {
289-
if self.env().caller() != self.owner {
290-
return Err(FarmError::CallerNotOwner);
291-
}
288+
ensure!(self.env().caller() == self.owner, FarmError::CallerNotOwner);
292289
self.update()?;
293-
if self.is_active() {
294-
return Err(FarmError::FarmAlreadyRunning);
295-
}
290+
ensure!(!self.is_active(), FarmError::FarmAlreadyRunning);
296291
self.farm_reward_rates = self.assert_start_params(start, end, rewards.clone())?;
297292
self.start = start;
298293
self.end = end;
@@ -301,9 +296,7 @@ mod farm {
301296

302297
#[ink(message)]
303298
fn owner_stop_farm(&mut self) -> Result<(), FarmError> {
304-
if self.env().caller() != self.owner {
305-
return Err(FarmError::CallerNotOwner);
306-
}
299+
ensure!(self.env().caller() == self.owner, FarmError::CallerNotOwner);
307300
self.update()?;
308301
self.end = self.env().block_timestamp();
309302
Ok(())

0 commit comments

Comments
 (0)