fix: add ProviderError in Error for FCall

cartridge-gg · Dec 15, 2023 · ae688eb · ae688eb
1 parent 8bba7d3
commit ae688eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/crates/cairo-serde/src/call.rs b/crates/cairo-serde/src/call.rs
@@ -1,8 +1,9 @@
 //! This file must be in the proc_macro2 crate that must be reworked.
-use crate::{CairoSerde, Error, Result as CairoResult};
 use starknet::core::types::{BlockId, BlockTag, FunctionCall};
 use std::marker::PhantomData;
 
+use crate::{CairoSerde, Error, Result as CairoResult};
+
 #[derive(Debug)]
 pub struct FCall<'p, P, T> {
     pub call_raw: FunctionCall,
@@ -39,7 +40,7 @@ where
             .provider
             .call(self.call_raw, self.block_id)
             .await
-            .map_err(|err| Error::Deserialize(format!("Deserialization error {}", err)))?;
+            .map_err(Error::Provider)?;
 
         T::cairo_deserialize(&r, 0)
     }

diff --git a/crates/cairo-serde/src/error.rs b/crates/cairo-serde/src/error.rs
@@ -1,19 +1,22 @@
 use super::CairoSerde;
 
 use starknet::core::types::FieldElement;
+use starknet::providers::ProviderError;
 
 /// Cairo types result.
 pub type Result<T> = core::result::Result<T, Error>;
 
 /// A cairo type error.
-#[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error("Invalid type found {0:?}.")]
     InvalidTypeString(String),
     #[error("Error during serialization {0:?}.")]
     Serialize(String),
     #[error("Error during deserialization {0:?}.")]
     Deserialize(String),
+    #[error("Provider errror {0:?}.")]
+    Provider(#[from] ProviderError),
 }
 
 impl CairoSerde for Error {

diff --git a/crates/rs/src/expand/contract.rs b/crates/rs/src/expand/contract.rs
@@ -40,15 +40,15 @@ impl CairoContract {
             pub struct #reader<P: #snrs_providers::Provider + Sync> {
                 pub address: #snrs_types::FieldElement,
                 pub provider: P,
-                pub block_id: Option<#snrs_types::BlockId>,
+                pub block_id: #snrs_types::BlockId,
             }
 
             impl<P: #snrs_providers::Provider + Sync> #reader<P> {
                 pub fn new(
                     address: #snrs_types::FieldElement,
                     provider: P,
                 ) -> Self {
-                    Self { address, provider, block_id: None }
+                    Self { address, provider, block_id: #snrs_types::BlockId::Tag(#snrs_types::BlockTag::Pending) }
                 }
 
                 pub fn set_contract_address(mut self, address: #snrs_types::FieldElement) {
@@ -60,7 +60,7 @@ impl CairoContract {
                 }
 
                 pub fn with_block(self, block_id: #snrs_types::BlockId) -> Self {
-                    Self { block_id: Some(block_id), ..self }
+                    Self { block_id, ..self }
                 }
             }
         };