Style changes / code improvements

0xSpaceShard · Jul 9, 2024 · 4e34912 · 4e34912
1 parent e628368
commit 4e34912
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/crates/starknet-devnet-server/src/api/http/endpoints/blocks.rs b/crates/starknet-devnet-server/src/api/http/endpoints/blocks.rs
@@ -48,7 +48,7 @@ pub(crate) async fn abort_blocks_impl(
     }
 
     let block_id = match data.starting_block_id {
-        Some(block_id) => block_id.0,
+        Some(block_id) => From::from(block_id),
         None => match data.starting_block_hash {
             Some(block_hash) => BlockId::Hash(block_hash.into()),
             None => {

diff --git a/crates/starknet-devnet/tests/test_abort_blocks.rs b/crates/starknet-devnet/tests/test_abort_blocks.rs
@@ -36,18 +36,15 @@ mod abort_blocks_tests {
         devnet: &BackgroundDevnet,
         starting_block_id: &BlockId,
     ) -> Vec<FieldElement> {
-        let params = match starting_block_id {
-            BlockId::Hash(block_hash) => {
-                json!({ "starting_block_id": { "block_hash": to_hex_felt(block_hash) }})
-            }
-            BlockId::Number(block_number) => {
-                json!({ "starting_block_id": { "block_number": block_number } })
-            }
-            BlockId::Tag(block_id) => json!({ "starting_block_id": block_id }),
-        };
-
-        let mut aborted_blocks =
-            devnet.send_custom_rpc("devnet_abortBlocks", params).await.unwrap();
+        let mut aborted_blocks = devnet
+            .send_custom_rpc(
+                "devnet_abortBlocks",
+                json!({
+                    "starting_block_id" : starting_block_id
+                }),
+            )
+            .await
+            .unwrap();
 
         let aborted_blocks = aborted_blocks["aborted"].take().as_array().unwrap().clone();
 
@@ -73,17 +70,15 @@ mod abort_blocks_tests {
     }
 
     async fn abort_blocks_error(devnet: &BackgroundDevnet, starting_block_id: &BlockId) {
-        let params = match starting_block_id {
-            BlockId::Hash(block_hash) => {
-                json!({ "starting_block_id": { "block_hash": to_hex_felt(block_hash) }})
-            }
-            BlockId::Number(block_number) => {
-                json!({ "starting_block_id": { "block_number": block_number } })
-            }
-            BlockId::Tag(block_id) => json!({ "starting_block_id": block_id }),
-        };
-        let aborted_blocks_error =
-            devnet.send_custom_rpc("devnet_abortBlocks", params).await.unwrap_err();
+        let aborted_blocks_error = devnet
+            .send_custom_rpc(
+                "devnet_abortBlocks",
+                json!({
+                "starting_block_id" : starting_block_id
+                }),
+            )
+            .await
+            .unwrap_err();
 
         assert!(aborted_blocks_error.message.contains("Block abortion failed"));
     }