chore: pause methods

near · May 3, 2024 · 7a44728 · 7a44728
1 parent c3311a6
commit 7a44728
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/macros/src/pause.rs b/macros/src/pause.rs
@@ -46,7 +46,7 @@ pub fn expand(meta: PauseMeta) -> Result<TokenStream, darling::Error> {
         #[#near_sdk::near]
         impl #imp #me::pause::PauseExternal for #ident #ty #wher {
             fn paus_is_paused(&self) -> bool {
-                <Self as #me::pause::Pause>::is_paused()
+                #me::pause::Pause::is_paused(self)
             }
         }
     })

diff --git a/src/pause.rs b/src/pause.rs
@@ -96,7 +96,7 @@ pub trait Pause {
     fn set_is_paused(&mut self, is_paused: bool);
 
     /// Returns `true` if the contract is paused, `false` otherwise
-    fn is_paused() -> bool;
+    fn is_paused(&self) -> bool;
 
     /// Pauses the contract if it is currently unpaused, panics otherwise.
     /// Emits a `PauseEvent::Pause` event.
@@ -107,39 +107,39 @@ pub trait Pause {
     fn unpause(&mut self);
 
     /// Rejects if the contract is unpaused.
-    fn require_paused();
+    fn require_paused(&self);
 
     /// Rejects if the contract is paused.
-    fn require_unpaused();
+    fn require_unpaused(&self);
 }
 
 impl<T: PauseInternal> Pause for T {
     fn set_is_paused(&mut self, is_paused: bool) {
         Self::slot_paused().write(&is_paused);
     }
 
-    fn is_paused() -> bool {
+    fn is_paused(&self) -> bool {
         Self::slot_paused().read().unwrap_or(false)
     }
 
     fn pause(&mut self) {
-        Self::require_unpaused();
+        self.require_unpaused();
         self.set_is_paused(true);
         PauseEvent::Pause.emit();
     }
 
     fn unpause(&mut self) {
-        Self::require_paused();
+        self.require_paused();
         self.set_is_paused(false);
         PauseEvent::Unpause.emit();
     }
 
-    fn require_paused() {
-        require!(Self::is_paused(), UNPAUSED_FAIL_MESSAGE);
+    fn require_paused(&self) {
+        require!(self.is_paused(), UNPAUSED_FAIL_MESSAGE);
     }
 
-    fn require_unpaused() {
-        require!(!Self::is_paused(), PAUSED_FAIL_MESSAGE);
+    fn require_unpaused(&self) {
+        require!(!self.is_paused(), PAUSED_FAIL_MESSAGE);
     }
 }
 
@@ -172,7 +172,7 @@ pub mod hooks {
         C: Pause,
     {
         fn hook<R>(contract: &mut C, _args: &A, f: impl FnOnce(&mut C) -> R) -> R {
-            C::require_unpaused();
+            contract.require_unpaused();
             f(contract)
         }
     }

diff --git a/tests/macros/mod.rs b/tests/macros/mod.rs
@@ -84,7 +84,7 @@ mod integration {
         }
 
         pub fn set_value(&mut self, value: u32) {
-            Self::require_unpaused();
+            self.require_unpaused();
             Self::require_role(&Role::CanSetValue);
 
             let old = self.value;
@@ -141,7 +141,7 @@ struct MigrateIntegration {
 impl MigrateHook for MigrateIntegration {
     fn on_migrate(old: Integration) -> Self {
         old.require_owner();
-        Self::require_unpaused();
+        old.require_unpaused();
 
         Self {
             new_value: "my string".to_string(),
@@ -161,7 +161,7 @@ impl MigrateIntegration {
     }
 
     pub fn set_value(&mut self, value: u32) {
-        Self::require_unpaused();
+        self.require_unpaused();
         Self::require_role(&Role::CanSetValue);
 
         let old = self.moved_value;

diff --git a/tests/macros/pause.rs b/tests/macros/pause.rs
@@ -28,13 +28,13 @@ struct Contract {
 #[near]
 impl Contract {
     pub fn only_when_unpaused(&mut self, value: u32) {
-        Self::require_unpaused();
+        self.require_unpaused();
 
         self.value = value;
     }
 
     pub fn only_when_paused(&mut self, value: u32) {
-        Self::require_paused();
+        self.require_paused();
 
         self.value = value;
     }
@@ -53,19 +53,19 @@ fn derive_pause() {
         "Initial state should be unpaused",
     );
 
-    Contract::require_unpaused();
+    contract.require_unpaused();
 
     contract.pause();
 
     assert!(contract.paus_is_paused(), "Pausing the contract works");
 
-    Contract::require_paused();
+    contract.require_paused();
 
     contract.unpause();
 
     assert!(!contract.paus_is_paused(), "Unpausing the contract works");
 
-    Contract::require_unpaused();
+    contract.require_unpaused();
 }
 
 #[test]

diff --git a/tests/macros/standard/nep171/manual_integration.rs b/tests/macros/standard/nep171/manual_integration.rs
@@ -30,7 +30,7 @@ impl Hook<Contract, action::Nep171Transfer<'_>> for Contract {
         _args: &action::Nep171Transfer<'_>,
         f: impl FnOnce(&mut Contract) -> R,
     ) -> R {
-        Contract::require_unpaused();
+        contract.require_unpaused();
         f(contract)
     }
 }
@@ -53,7 +53,7 @@ impl Contract {
     }
 
     pub fn mint(&mut self) -> TokenId {
-        Self::require_unpaused();
+        self.require_unpaused();
 
         let token_id = format!("token_{}", self.next_token_id);
         self.next_token_id += 1;

diff --git a/tests/macros/standard/nep171/non_fungible_token.rs b/tests/macros/standard/nep171/non_fungible_token.rs
@@ -31,7 +31,7 @@ impl Contract {
     }
 
     pub fn mint(&mut self) -> TokenId {
-        Self::require_unpaused();
+        self.require_unpaused();
 
         let token_id = format!("token_{}", self.next_token_id);
         self.next_token_id += 1;