Fix false positive test (#1529)

<!-- Reference any GitHub issues resolved by this PR -->

Closes #

## Introduced changes

<!-- A brief description of the changes -->

-

## Checklist

<!-- Make sure all of these are complete -->

- [x] Linked relevant issue
- [x] Updated relevant documentation
- [x] Added relevant tests
- [x] Performed self-review of the code
- [x] Added changes to `CHANGELOG.md`

---------

Co-authored-by: Wojciech Szymczyk <[email protected]>

Author: tkumor3

crates/sncast/tests/data/keystore/predeployed_account.json

@@ -0,0 +1,13 @@
+{
+  "deployment": {
+    "address": "0x4ee94bdf625820bc562c49c4d1ca4b2ef82bcfc5ed0cf67464770bea333b19a",
+    "class_hash": "0x4d07e40e93398ed3c76981e72dd1fd22557a78ce36c0515f679e27f0bb5bc5f",
+    "status": "deployed"
+  },
+  "variant": {
+    "public_key": "0xd39cc3278f855cb025b28409d16137792175638a8acec3b5b3d2487d2472a6",
+    "type": "open_zeppelin",
+    "version": 1
+  },
+  "version": 1
+}

crates/sncast/tests/data/keystore/predeployed_key.json

@@ -0,0 +1,18 @@
+{
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "969dc1d196eccd96518b4945820a7ac0" },
+    "ciphertext": "fd20c0dfa110976bffa70b54321487c4546d0c26816c8383ffcfa1ba099f73b1",
+    "kdf": "scrypt",
+    "kdfparams": {
+      "dklen": 32,
+      "n": 8192,
+      "p": 1,
+      "r": 8,
+      "salt": "177919634a458573cf15ee537f658cca630d32aaae1a3b7cecf86a427ef01ea9"
+    },
+    "mac": "adada9c6d157999ba340dc99c6b6596698904026e3f619d025962d1cbcd2a50e"
+  },
+  "id": "caf9c371-4e46-45c7-b682-a44667a83725",
+  "version": 3
+}

crates/sncast/tests/e2e/declare.rs

@@ -5,7 +5,6 @@ use crate::helpers::fixtures::{
 use indoc::indoc;
 use snapbox::cmd::{cargo_bin, Command};
 use starknet::core::types::TransactionReceipt::Declare;
-use std::fs;
 use test_case::test_case;
 
 #[tokio::test]
@@ -38,8 +37,6 @@ async fn test_happy_case() {
     let receipt = get_transaction_receipt(hash).await;
 
     assert!(matches!(receipt, Declare(_)));
-
-    fs::remove_dir_all(contract_path).unwrap();
 }
 
 #[tokio::test]
@@ -144,8 +141,6 @@ fn test_too_low_max_fee() {
         command: declare
         error: Max fee is smaller than the minimal transaction cost
     "});
-
-    fs::remove_dir_all(contract_path).unwrap();
 }
 
 #[test]

crates/sncast/tests/e2e/main_tests.rs

@@ -250,8 +250,8 @@ async fn test_keystore_undeployed_account() {
 async fn test_keystore_declare() {
     let contract_path =
         duplicate_directory_with_salt(CONTRACTS_DIR.to_string() + "/map", "put", "999");
-    let my_key_path = get_keystores_path("tests/data/keystore/my_key.json");
-    let my_account_path = get_keystores_path("tests/data/keystore/my_account.json");
+    let my_key_path = get_keystores_path("tests/data/keystore/predeployed_key.json");
+    let my_account_path = get_keystores_path("tests/data/keystore/predeployed_account.json");
     let args = vec![
         "--url",
         URL,
@@ -269,7 +269,5 @@ async fn test_keystore_declare() {
         .current_dir(contract_path.path())
         .args(args);
 
-    snapbox.assert().success().get_output().stderr.is_empty();
-
-    fs::remove_dir_all(contract_path).unwrap();
+    assert!(snapbox.assert().success().get_output().stderr.is_empty());
 }

crates/sncast/tests/helpers/devnet.rs

@@ -1,5 +1,7 @@
 use crate::helpers::constants::{DEVNET_ENV_FILE, SEED, URL};
-use crate::helpers::fixtures::{declare_contract, declare_deploy_contract, remove_devnet_env};
+use crate::helpers::fixtures::{
+    declare_contract, declare_deploy_contract, deploy_keystore_account, remove_devnet_env,
+};
 use ctor::{ctor, dtor};
 use std::net::TcpStream;
 use std::process::{Command, Stdio};
@@ -66,6 +68,9 @@ fn start_devnet() {
         "/constructor_with_params/target/dev/constructor_with_params_ConstructorWithParams",
         "CAST_WITH_CONSTRUCTOR",
     ));
+
+    rt.block_on(deploy_keystore_account());
+
     dotenv::from_filename(DEVNET_ENV_FILE).unwrap();
 }
 

crates/sncast/tests/helpers/fixtures.rs

@@ -1,12 +1,14 @@
-use crate::helpers::constants::{ACCOUNT_FILE_PATH, CONTRACTS_DIR, DEVNET_ENV_FILE, URL};
+use crate::helpers::constants::{
+    ACCOUNT_FILE_PATH, CONTRACTS_DIR, DEVNET_ENV_FILE, DEVNET_OZ_CLASS_HASH, URL,
+};
 use camino::Utf8PathBuf;
 use primitive_types::U256;
 use serde::de::DeserializeOwned;
 use serde::Deserialize;
 use serde_json::{json, Map, Value};
-use sncast::{apply_optional, get_keystore_password};
+use sncast::{apply_optional, get_chain_id, get_keystore_password};
 use sncast::{get_account, get_provider, parse_number};
-use starknet::accounts::{Account, Call, Execution};
+use starknet::accounts::{Account, AccountFactory, Call, Execution, OpenZeppelinAccountFactory};
 use starknet::contract::ContractFactory;
 use starknet::core::types::contract::{CompiledClass, SierraClass};
 use starknet::core::types::TransactionReceipt;
@@ -15,7 +17,7 @@ use starknet::core::utils::get_contract_address;
 use starknet::core::utils::get_selector_from_name;
 use starknet::providers::jsonrpc::HttpTransport;
 use starknet::providers::JsonRpcClient;
-use starknet::signers::SigningKey;
+use starknet::signers::{LocalWallet, SigningKey};
 use std::env;
 use std::fs;
 use std::fs::OpenOptions;
@@ -69,6 +71,46 @@ pub async fn declare_contract(account: &str, path: &str, shortname: &str) -> Fie
     class_hash
 }
 
+pub async fn deploy_keystore_account() {
+    let keystore_path = "tests/data/keystore/predeployed_key.json";
+    let account_path = "tests/data/keystore/predeployed_account.json";
+    let private_key =
+        SigningKey::from_keystore(keystore_path, "123").expect("Could not get the private_key");
+
+    let provider = get_provider(URL).expect("Could not get the provider");
+    let chain_id = get_chain_id(&provider)
+        .await
+        .expect("Could not get chain_id from provider");
+
+    let contents =
+        std::fs::read_to_string(account_path).expect("Failed to read keystore account file");
+    let items: serde_json::Value = serde_json::from_str(&contents)
+        .unwrap_or_else(|_| panic!("Failed to parse keystore account file at = {account_path}"));
+
+    let factory = OpenZeppelinAccountFactory::new(
+        parse_number(DEVNET_OZ_CLASS_HASH).expect("Could not parse DEVNET_OZ_CLASS_HASH"),
+        chain_id,
+        LocalWallet::from_signing_key(private_key),
+        provider,
+    )
+    .await
+    .expect("Could not create Account Factory");
+
+    mint_token(
+        items["deployment"]["address"]
+            .as_str()
+            .expect("Could not get address"),
+        9_999_999_999_999_999_999,
+    )
+    .await;
+
+    factory
+        .deploy(parse_number("0xa5d90c65b1b1339").expect("Could not parse salt"))
+        .send()
+        .await
+        .expect("Could not deploy keystore account");
+}
+
 pub async fn declare_deploy_contract(account: &str, path: &str, shortname: &str) {
     let class_hash = declare_contract(account, path, shortname).await;