From 6311c8e4e0a56c72801fe30cacb5603423e8be5a Mon Sep 17 00:00:00 2001
From: Ammar Arif <evergreenkary@gmail.com>
Date: Sat, 12 Oct 2024 13:34:03 -0400
Subject: [PATCH] test(katana-rpc): don't use binary runner in katana tests
 (#2525)

dont use binary runner in katana tests
---
 Cargo.lock                               |  1 -
 crates/katana/rpc/rpc/Cargo.toml         |  1 -
 crates/katana/rpc/rpc/tests/messaging.rs | 47 ++++++++++--------------
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 06c2717c54..8d5cab82b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8272,7 +8272,6 @@ dependencies = [
  "katana-rpc-api",
  "katana-rpc-types",
  "katana-rpc-types-builder",
- "katana-runner",
  "katana-tasks",
  "metrics",
  "num-traits 0.2.19",
diff --git a/crates/katana/rpc/rpc/Cargo.toml b/crates/katana/rpc/rpc/Cargo.toml
index 29ea196228..cfd8b99c52 100644
--- a/crates/katana/rpc/rpc/Cargo.toml
+++ b/crates/katana/rpc/rpc/Cargo.toml
@@ -38,7 +38,6 @@ jsonrpsee = { workspace = true, features = [ "client" ] }
 katana-cairo.workspace = true
 katana-node.workspace = true
 katana-rpc-api = { workspace = true, features = [ "client" ] }
-katana-runner.workspace = true
 num-traits.workspace = true
 rand.workspace = true
 rstest.workspace = true
diff --git a/crates/katana/rpc/rpc/tests/messaging.rs b/crates/katana/rpc/rpc/tests/messaging.rs
index 9dcb5a0031..86316eb159 100644
--- a/crates/katana/rpc/rpc/tests/messaging.rs
+++ b/crates/katana/rpc/rpc/tests/messaging.rs
@@ -7,14 +7,15 @@ use alloy::providers::{ProviderBuilder, WalletProvider};
 use alloy::sol;
 use cainome::cairo_serde::EthAddress;
 use cainome::rs::abigen;
+use dojo_test_utils::sequencer::{get_default_test_config, TestSequencer};
 use dojo_utils::TransactionWaiter;
+use katana_core::service::messaging::MessagingConfig;
+use katana_node::config::SequencingConfig;
 use katana_primitives::utils::transaction::{
     compute_l1_handler_tx_hash, compute_l1_to_l2_message_hash, compute_l2_to_l1_message_hash,
 };
 use katana_rpc_types::receipt::ReceiptBlock;
-use katana_runner::{KatanaRunner, KatanaRunnerConfig};
 use rand::Rng;
-use serde_json::json;
 use starknet::accounts::{Account, ConnectedAccount};
 use starknet::contract::ContractFactory;
 use starknet::core::types::{
@@ -24,7 +25,6 @@ use starknet::core::types::{
 use starknet::core::utils::get_contract_address;
 use starknet::macros::selector;
 use starknet::providers::Provider;
-use tempfile::tempdir;
 
 mod common;
 
@@ -62,30 +62,21 @@ async fn test_messaging() {
     // Deploy test contract on L1 used to send/receive messages to/from L2
     let l1_test_contract = Contract1::deploy(&l1_provider, *core_contract.address()).await.unwrap();
 
-    // Prepare Katana + Messaging Contract
-    let messaging_config = json!({
-        "chain": "ethereum",
-        "rpc_url": format!("http://localhost:{}", port),
-        "contract_address": core_contract.address().to_string(),
-        "sender_address": l1_provider.default_signer_address(),
-        "private_key": "",
-        "interval": 2,
-        "from_block": 0
-    })
-    .to_string();
-
-    let dir = tempdir().expect("failed creating temp dir");
-    let path = dir.path().join("temp-anvil-messaging.json");
-    std::fs::write(&path, messaging_config.as_bytes()).expect("failed to write config to file");
-
-    let katana_runner = KatanaRunner::new_with_config(KatanaRunnerConfig {
-        n_accounts: 2,
-        messaging: Some(path.to_str().unwrap().to_string()),
-        ..Default::default()
-    })
-    .unwrap();
-
-    let katana_account = katana_runner.account(0);
+    let messaging_config = MessagingConfig {
+        chain: "ethereum".to_string(),
+        rpc_url: format!("http://localhost:{}", port),
+        contract_address: core_contract.address().to_string(),
+        sender_address: l1_provider.default_signer_address().to_string(),
+        private_key: "".to_string(),
+        interval: 2,
+        from_block: 0,
+    };
+
+    let mut config = get_default_test_config(SequencingConfig::default());
+    config.messaging = Some(messaging_config);
+    let sequencer = TestSequencer::start(config).await;
+
+    let katana_account = sequencer.account();
 
     // Deploy test L2 contract that can send/receive messages to/from L1
     let l2_test_contract = {
@@ -183,7 +174,7 @@ async fn test_messaging() {
             recipient,
             selector,
             &l1_tx_calldata,
-            katana_runner.provider().chain_id().await.unwrap(),
+            sequencer.provider().chain_id().await.unwrap(),
             nonce.to::<u64>().into(),
         );