Format

dojoengine · Aug 5, 2023 · de8fc2f · de8fc2f
1 parent 9d8a819
commit de8fc2f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 29 deletions.
diff --git a/crates/dojo-lang/src/plugin.rs b/crates/dojo-lang/src/plugin.rs
@@ -62,11 +62,7 @@ impl GeneratedFileAuxData for DojoAuxData {
         self
     }
     fn eq(&self, other: &dyn GeneratedFileAuxData) -> bool {
-        if let Some(other) = other.as_any().downcast_ref::<Self>() {
-            self == other
-        } else {
-            false
-        }
+        if let Some(other) = other.as_any().downcast_ref::<Self>() { self == other } else { false }
     }
 }
 impl AsDynGeneratedFileAuxData for DojoAuxData {

diff --git a/crates/dojo-world/src/manifest.rs b/crates/dojo-world/src/manifest.rs
@@ -151,8 +151,10 @@ impl Manifest {
                     .call(
                         FunctionCall {
                             contract_address: world_address,
-                            calldata: vec![cairo_short_string_to_felt(&component.name)
-                                .map_err(ManifestError::InvalidNameError)?],
+                            calldata: vec![
+                                cairo_short_string_to_felt(&component.name)
+                                    .map_err(ManifestError::InvalidNameError)?,
+                            ],
                             entry_point_selector: get_selector_from_name("component").unwrap(),
                         },
                         BlockId::Tag(BlockTag::Pending),
@@ -172,12 +174,14 @@ impl Manifest {
                     .call(
                         FunctionCall {
                             contract_address: world_address,
-                            calldata: vec![cairo_short_string_to_felt(
-                                // because the name returns by the `name` method of
-                                // a system contract is without the 'System' suffix
-                                system.name.strip_suffix("System").unwrap_or(&system.name),
-                            )
-                            .map_err(ManifestError::InvalidNameError)?],
+                            calldata: vec![
+                                cairo_short_string_to_felt(
+                                    // because the name returns by the `name` method of
+                                    // a system contract is without the 'System' suffix
+                                    system.name.strip_suffix("System").unwrap_or(&system.name),
+                                )
+                                .map_err(ManifestError::InvalidNameError)?,
+                            ],
                             entry_point_selector: get_selector_from_name("system").unwrap(),
                         },
                         BlockId::Tag(BlockTag::Pending),

diff --git a/crates/dojo-world/src/migration/class.rs b/crates/dojo-world/src/migration/class.rs
@@ -16,11 +16,7 @@ pub struct ClassDiff {
 
 impl StateDiff for ClassDiff {
     fn is_same(&self) -> bool {
-        if let Some(remote) = self.remote {
-            self.local == remote
-        } else {
-            false
-        }
+        if let Some(remote) = self.remote { self.local == remote } else { false }
     }
 }
 

diff --git a/crates/dojo-world/src/migration/contract.rs b/crates/dojo-world/src/migration/contract.rs
@@ -18,11 +18,7 @@ pub struct ContractDiff {
 
 impl StateDiff for ContractDiff {
     fn is_same(&self) -> bool {
-        if let Some(remote) = self.remote {
-            self.local == remote
-        } else {
-            false
-        }
+        if let Some(remote) = self.remote { self.local == remote } else { false }
     }
 }
 

diff --git a/crates/katana/rpc/src/api/starknet.rs b/crates/katana/rpc/src/api/starknet.rs
@@ -70,7 +70,7 @@ pub trait StarknetApi {
 
     #[method(name = "getNonce")]
     async fn nonce(&self, block_id: BlockId, contract_address: FieldElement)
-        -> Result<Felt, Error>;
+    -> Result<Felt, Error>;
 
     #[method(name = "blockNumber")]
     async fn block_number(&self) -> Result<u64, Error>;

diff --git a/crates/torii/src/graphql/types.rs b/crates/torii/src/graphql/types.rs
@@ -107,10 +107,6 @@ impl ScalarType {
     }
 
     pub fn as_sql_type(&self) -> &'static str {
-        if self.is_numeric_type() {
-            "INTEGER"
-        } else {
-            "TEXT"
-        }
+        if self.is_numeric_type() { "INTEGER" } else { "TEXT" }
     }
 }