Replace u32 with core::num::NonZeroU32

use-ink · May 27, 2021 · 0e769f7 · 0e769f7
1 parent 4f774f2
commit 0e769f7
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/crates/env/src/api.rs b/crates/env/src/api.rs
@@ -186,7 +186,7 @@ where
 /// # Errors
 ///
 /// If the returned value cannot be properly decoded.
-pub fn rent_status<T>(at_refcount: Option<u32>) -> Result<RentStatus<T>>
+pub fn rent_status<T>(at_refcount: Option<core::num::NonZeroU32>) -> Result<RentStatus<T>>
 where
     T: Environment,
 {

diff --git a/crates/env/src/backend.rs b/crates/env/src/backend.rs
@@ -240,7 +240,7 @@ pub trait TypedEnvBackend: EnvBackend {
     /// For more details visit: [`RentStatus`][`crate::RentStatus`]
     fn rent_status<T: Environment>(
         &mut self,
-        at_refcount: Option<u32>,
+        at_refcount: Option<core::num::NonZeroU32>,
     ) -> Result<RentStatus<T>>;
 
     /// Returns the current block number.

diff --git a/crates/env/src/engine/experimental_off_chain/impls.rs b/crates/env/src/engine/experimental_off_chain/impls.rs
@@ -310,7 +310,10 @@ impl TypedEnvBackend for EnvInstance {
         unimplemented!("off-chain environment does not support rent params")
     }
 
-    fn rent_status<T>(&mut self, _at_refcount: Option<u32>) -> Result<RentStatus<T>>
+    fn rent_status<T>(
+        &mut self,
+        _at_refcount: Option<core::num::NonZeroU32>,
+    ) -> Result<RentStatus<T>>
     where
         T: Environment,
     {

diff --git a/crates/env/src/engine/off_chain/impls.rs b/crates/env/src/engine/off_chain/impls.rs
@@ -394,7 +394,10 @@ impl TypedEnvBackend for EnvInstance {
         })
     }
 
-    fn rent_status<T>(&mut self, _at_refcount: Option<u32>) -> Result<RentStatus<T>>
+    fn rent_status<T>(
+        &mut self,
+        _at_refcount: Option<core::num::NonZeroU32>,
+    ) -> Result<RentStatus<T>>
     where
         T: Environment,
     {

diff --git a/crates/env/src/engine/on_chain/ext.rs b/crates/env/src/engine/on_chain/ext.rs
@@ -616,12 +616,12 @@ pub fn rent_params(output: &mut &mut [u8]) {
     extract_from_slice(output, output_len as usize);
 }
 
-pub fn rent_status(at_refcount: Option<u32>, output: &mut &mut [u8]) {
+pub fn rent_status(at_refcount: Option<core::num::NonZeroU32>, output: &mut &mut [u8]) {
     let mut output_len = output.len() as u32;
     {
         unsafe {
             sys::seal_rent_status(
-                at_refcount.unwrap_or(0),
+                at_refcount.map_or(0, |rc| rc.get()),
                 Ptr32Mut::from_slice(output),
                 Ptr32Mut::from_ref(&mut output_len),
             )

diff --git a/crates/env/src/engine/on_chain/impls.rs b/crates/env/src/engine/on_chain/impls.rs
@@ -366,7 +366,10 @@ impl TypedEnvBackend for EnvInstance {
         self.get_property::<RentParams<T>>(ext::rent_params)
     }
 
-    fn rent_status<T>(&mut self, at_refcount: Option<u32>) -> Result<RentStatus<T>>
+    fn rent_status<T>(
+        &mut self,
+        at_refcount: Option<core::num::NonZeroU32>,
+    ) -> Result<RentStatus<T>>
     where
         T: Environment,
     {

diff --git a/crates/lang/src/env_access.rs b/crates/lang/src/env_access.rs
@@ -204,7 +204,10 @@ where
     /// # Note
     ///
     /// For more details visit: [`ink_env::RentStatus`]
-    pub fn rent_status(self, at_refcount: Option<u32>) -> RentStatus<T> {
+    pub fn rent_status(
+        self,
+        at_refcount: Option<core::num::NonZeroU32>,
+    ) -> RentStatus<T> {
         ink_env::rent_status::<T>(at_refcount)
             .expect("couldn't decode contract rent params")
     }