chore(blockifier): simplify code in fn deploy_account_tx fn declare_tx

crates/blockifier/src/test_utils/declare.rs

@@ -1,15 +1,11 @@
 use starknet_api::contract_class::ClassInfo;
-use starknet_api::executable_transaction::{AccountTransaction as Transaction, DeclareTransaction};
 use starknet_api::test_utils::declare::DeclareTxArgs;
 
 use crate::transaction::account_transaction::AccountTransaction;
 
 pub fn declare_tx(declare_tx_args: DeclareTxArgs, class_info: ClassInfo) -> AccountTransaction {
-    let tx_hash = declare_tx_args.tx_hash;
-    let declare_tx = starknet_api::test_utils::declare::declare_tx(declare_tx_args);
+    let declare_tx =
+        starknet_api::test_utils::declare::executable_declare_tx(declare_tx_args, class_info);
 
-    let executable_tx =
-        Transaction::Declare(DeclareTransaction { tx: declare_tx, tx_hash, class_info });
-
-    executable_tx.into()
+    declare_tx.into()
 }

crates/blockifier/src/test_utils/deploy_account.rs

@@ -1,4 +1,3 @@
-use starknet_api::executable_transaction::AccountTransaction as Transaction;
 use starknet_api::test_utils::deploy_account::DeployAccountTxArgs;
 use starknet_api::test_utils::NonceManager;
 
@@ -12,7 +11,6 @@ pub fn deploy_account_tx(
         deploy_tx_args,
         nonce_manager,
     );
-    let executable_tx = Transaction::DeployAccount(deploy_account_tx);
 
-    executable_tx.into()
+    deploy_account_tx.into()
 }