move only_owner to internal impl

contracts/src/access/ownable.rs

@@ -67,23 +67,6 @@ impl Ownable {
  self._owner.get()
  }
 
- /// Checks if the [`msg::sender`] is set as the owner.
- ///
- /// # Errors
- ///
- /// If called by any account other than the owner, then the error
- /// [`Error::UnauthorizedAccount`] is returned.
- pub fn only_owner(&self) -> Result<(), Error> {
- let account = msg::sender();
- if self.owner() != account {
- return Err(Error::UnauthorizedAccount(
- OwnableUnauthorizedAccount { account },
- ));
- }
-
- Ok(())
- }
-
  /// Transfers ownership of the contract to a new account (`new_owner`). Can
  /// only be called by the current owner.
  ///
@@ -131,6 +114,23 @@ impl Ownable {
 }
 
 impl Ownable {
+ /// Checks if the [`msg::sender`] is set as the owner.
+ ///
+ /// # Errors
+ ///
+ /// If called by any account other than the owner, then the error
+ /// [`Error::UnauthorizedAccount`] is returned.
+ pub fn only_owner(&self) -> Result<(), Error> {
+ let account = msg::sender();
+ if self.owner() != account {
+ return Err(Error::UnauthorizedAccount(
+ OwnableUnauthorizedAccount { account },
+ ));
+ }
+
+ Ok(())
+ }
+
  /// Transfers ownership of the contract to a new account (`new_owner`).
  /// Internal function without access restriction.
  ///

contracts/src/access/ownable_two_step.rs

@@ -70,17 +70,6 @@ impl Ownable2Step {
  self._pending_owner.get()
  }
 
- /// Checks if the [`msg::sender`] is set as the owner.
- ///
- /// # Errors
- ///
- /// If called by any account other than the owner, then the error
- /// [`OwnableError::UnauthorizedAccount`] is returned.
- pub fn only_owner(&self) -> Result<(), OwnableError> {
- self._ownable.only_owner()?;
- Ok(())
- }
-
  /// Initiates the transfer of ownership to a new account (`new_owner`).
  /// Can only be called by the current owner.
  ///