From a44cff9cf9918815d2a43954792eb362b3c639f6 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:28:29 +0200 Subject: [PATCH] rm tests related to `kakarot_getStarknetTransactionHash` (#1400) --- rust-toolchain | 2 +- tests/tests/kakarot_api.rs | 123 +------------------------------------ 2 files changed, 3 insertions(+), 122 deletions(-) diff --git a/rust-toolchain b/rust-toolchain index bf867e0ae..8f563918e 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly +nightly-2024-09-15 \ No newline at end of file diff --git a/tests/tests/kakarot_api.rs b/tests/tests/kakarot_api.rs index 49b22b540..8be05efb5 100644 --- a/tests/tests/kakarot_api.rs +++ b/tests/tests/kakarot_api.rs @@ -1,137 +1,18 @@ #![allow(clippy::used_underscore_binding)] #![cfg(feature = "testing")] use kakarot_rpc::{ - client::KakarotTransactions, - providers::eth_provider::{constant::Constant, ChainProvider}, + providers::eth_provider::constant::Constant, test_utils::{ - eoa::Eoa, fixtures::{katana, setup}, katana::Katana, rpc::{start_kakarot_rpc_server, RawRpcParamsBuilder}, }, }; -use reth_primitives::{sign_message, Address, Bytes, Transaction, TransactionSigned, TxEip1559, TxKind, B256, U256}; +use reth_primitives::B256; use rstest::*; use serde_json::Value; use std::str::FromStr; -#[rstest] -#[awt] -#[tokio::test(flavor = "multi_thread")] -#[ignore = "failing because of relayer change"] -async fn test_kakarot_get_starknet_transaction_hash(#[future] katana: Katana, _setup: ()) { - let (_server_addr, server_handle) = - start_kakarot_rpc_server(&katana).await.expect("Error setting up Kakarot RPC server"); - - let eth_provider = katana.eth_provider(); - let eth_client = katana.eth_client(); - let chain_id = eth_provider.chain_id().await.unwrap_or_default().unwrap_or_default().to(); - - // Create a sample transaction - let transaction = Transaction::Eip1559(TxEip1559 { - chain_id, - nonce: 0, - gas_limit: 21000, - to: TxKind::Call(Address::random()), - value: U256::from(1000), - input: Bytes::default(), - max_fee_per_gas: 875_000_000, - max_priority_fee_per_gas: 0, - access_list: Default::default(), - }); - - // Sign the transaction - let signature = sign_message(katana.eoa().private_key(), transaction.signature_hash()).unwrap(); - let transaction_signed = TransactionSigned::from_transaction_and_signature(transaction, signature); - - // Send the transaction - let _tx_return = eth_client - .send_raw_transaction(transaction_signed.envelope_encoded()) - .await - .expect("failed to send transaction"); - - // TODO: this needs to be transferred inside the mempool - // // Retrieve the transaction from the database - // let tx: Option = - // eth_provider.database().get_first().await.expect("Failed to get transaction"); - - // // Assert that the number of retries is 0 - // assert_eq!(0, tx.clone().unwrap().retries); - - // let tx = tx.unwrap().tx; - - // // Assert the transaction hash and block number - // assert_eq!(tx.hash, transaction_signed.hash()); - // assert!(tx.block_number.is_none()); - - // let hash = tx.hash; - // let retries: u8 = 0; - - // let reqwest_client = reqwest::Client::new(); - // let res = reqwest_client - // .post(format!("http://localhost:{}", server_addr.port())) - // .header("Content-Type", "application/json") - // .body(RawRpcParamsBuilder::new("kakarot_getStarknetTransactionHash").add_param(hash).add_param(retries).build()) - // .send() - // .await - // .expect("kakarot_getStarknetTransactionHash error"); - // let result_starknet_transaction_hash: B256 = - // serde_json::from_str(&res.text().await.expect("Failed to get response body")) - // .and_then(|raw: Value| serde_json::from_value(raw["result"].clone())) - // .expect("Failed to deserialize result"); - - // assert_eq!(result_starknet_transaction_hash, tx_return); - - drop(server_handle); -} - -#[rstest] -#[awt] -#[tokio::test(flavor = "multi_thread")] -async fn test_kakarot_get_starknet_transaction_hash_with_none_tx_hash(#[future] katana: Katana, _setup: ()) { - let (server_addr, server_handle) = - start_kakarot_rpc_server(&katana).await.expect("Error setting up Kakarot RPC server"); - - let eth_provider = katana.eth_provider(); - let chain_id = eth_provider.chain_id().await.unwrap_or_default().unwrap_or_default().to(); - - // Create a sample transaction - let transaction = Transaction::Eip1559(TxEip1559 { - chain_id, - nonce: 0, - gas_limit: 21000, - to: TxKind::Call(Address::random()), - value: U256::from(1000), - input: Bytes::default(), - max_fee_per_gas: 875_000_000, - max_priority_fee_per_gas: 0, - access_list: Default::default(), - }); - - // Sign the transaction - let signature = sign_message(katana.eoa().private_key(), transaction.signature_hash()).unwrap(); - let transaction_signed = TransactionSigned::from_transaction_and_signature(transaction, signature); - - let hash = transaction_signed.hash(); - let retries: u8 = 0; - - let reqwest_client = reqwest::Client::new(); - let res: reqwest::Response = reqwest_client - .post(format!("http://localhost:{}", server_addr.port())) - .header("Content-Type", "application/json") - .body(RawRpcParamsBuilder::new("kakarot_getStarknetTransactionHash").add_param(hash).add_param(retries).build()) - .send() - .await - .expect("kakarot_getStarknetTransactionHash error"); - let response = res.text().await.expect("Failed to get response body"); - let raw: Value = serde_json::from_str(&response).expect("Failed to deserialize response body"); - let result_starknet_transaction_hash = raw["result"].as_str(); - - assert_eq!(result_starknet_transaction_hash, None); - - drop(server_handle); -} - #[rstest] #[awt] #[tokio::test(flavor = "multi_thread")]