katana: replace block_time: None by default (#1858)

Use default when possible
dojoengine · Apr 22, 2024 · d160479 · d160479
1 parent 10f7f9f
commit d160479
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/crates/katana/core/tests/sequencer.rs b/crates/katana/core/tests/sequencer.rs
@@ -1,5 +1,5 @@
 use alloy_primitives::U256;
-use katana_core::backend::config::{Environment, StarknetConfig};
+use katana_core::backend::config::StarknetConfig;
 use katana_core::sequencer::{KatanaSequencer, SequencerConfig};
 use katana_executor::implementation::noop::NoopExecutorFactory;
 use katana_primitives::genesis::allocation::DevAllocationsGenerator;
@@ -17,13 +17,8 @@ fn create_test_sequencer_config() -> (SequencerConfig, StarknetConfig) {
     genesis.extend_allocations(accounts.into_iter().map(|(k, v)| (k, v.into())));
 
     (
-        SequencerConfig { block_time: None, ..Default::default() },
-        StarknetConfig {
-            genesis,
-            disable_fee: true,
-            env: Environment::default(),
-            ..Default::default()
-        },
+        SequencerConfig::default(),
+        StarknetConfig { genesis, disable_fee: true, ..Default::default() },
     )
 }
 

diff --git a/crates/katana/rpc/rpc/tests/saya.rs b/crates/katana/rpc/rpc/tests/saya.rs
@@ -23,7 +23,7 @@ mod common;
 async fn no_pending_support() {
     // Saya does not support the pending block and only work on sealed blocks.
     let sequencer = TestSequencer::start(
-        SequencerConfig { block_time: None, no_mining: true, ..Default::default() },
+        SequencerConfig { no_mining: true, ..Default::default() },
         get_default_test_starknet_config(),
     )
     .await;
@@ -47,7 +47,7 @@ async fn no_pending_support() {
 async fn process_sealed_block_only() {
     // Saya does not support the pending block and only work on sealed blocks.
     let sequencer = TestSequencer::start(
-        SequencerConfig { block_time: None, no_mining: true, ..Default::default() },
+        SequencerConfig { no_mining: true, ..Default::default() },
         get_default_test_starknet_config(),
     )
     .await;
@@ -118,7 +118,7 @@ async fn process_sealed_block_only() {
 #[tokio::test(flavor = "multi_thread")]
 async fn executions_chunks_logic_ok() {
     let sequencer = TestSequencer::start(
-        SequencerConfig { block_time: None, no_mining: true, ..Default::default() },
+        SequencerConfig { no_mining: true, ..Default::default() },
         get_default_test_starknet_config(),
     )
     .await;

diff --git a/crates/katana/rpc/rpc/tests/torii.rs b/crates/katana/rpc/rpc/tests/torii.rs
@@ -23,7 +23,7 @@ pub const ENOUGH_GAS: &str = "0x100000000000000000";
 #[tokio::test(flavor = "multi_thread")]
 async fn test_get_transactions() {
     let sequencer = TestSequencer::start(
-        SequencerConfig { block_time: None, no_mining: true, ..Default::default() },
+        SequencerConfig { no_mining: true, ..Default::default() },
         get_default_test_starknet_config(),
     )
     .await;
@@ -176,7 +176,7 @@ async fn test_get_transactions() {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_get_transactions_with_instant_mining() {
     let sequencer = TestSequencer::start(
-        SequencerConfig { block_time: None, no_mining: false, ..Default::default() },
+        SequencerConfig { no_mining: false, ..Default::default() },
         get_default_test_starknet_config(),
     )
     .await;